From 8cc966dde8d6c882a42b34c0293bad0801e9314f Mon Sep 17 00:00:00 2001
From: Konano <nanoapezlk@gmail.com>
Date: Fri, 8 Nov 2024 18:10:26 +0800
Subject: [PATCH] =?UTF-8?q?minor:=20=E5=B0=86=20config=5Fgit=5Fgpg=20?=
 =?UTF-8?q?=E4=BB=8E=20user=20=E8=BD=AC=E7=A7=BB=E9=83=BD=20priv?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 configure_priv.sh | 24 ++++++++++++++++++++++++
 configure_user.sh | 26 --------------------------
 2 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/configure_priv.sh b/configure_priv.sh
index 4391da9..50de8cb 100755
--- a/configure_priv.sh
+++ b/configure_priv.sh
@@ -475,6 +475,30 @@ configure_node_exporter() {
 #     fi
 # }
 
+configure_git_gpg() {
+    ! command_exists git && return
+    [ ! -f ~/.gitconfig ] && return
+    [ -n "$(git config --global user.signingkey)" ] && return
+
+    if confirm_action "要配置 git 使用 gpg 签名吗？" "N"; then
+        if ! command_exists 7za; then
+            sudo apt install p7zip-full -y
+        fi
+        read_password
+        cp $scriptdir/files/git.key.zip $tempdir/git.key.zip
+        7za x -p$password $tempdir/git.key.zip -o$tempdir > /dev/null 2>&1
+        rm $tempdir/git.key.zip
+        if [ ! -s $tempdir/git.key ]; then
+            echo "Wrong password!"
+            return
+        fi
+        gpg --import $tempdir/git.key
+        rm $tempdir/git.key
+        git config --global user.signingkey 4ACB54FB3EFF978038BFB374A523E440E24B89CF
+        git config --global commit.gpgSign true
+    fi
+}
+
 # ============================================================
 
 configure_swap() {
diff --git a/configure_user.sh b/configure_user.sh
index 707ac7c..3bfa2c4 100755
--- a/configure_user.sh
+++ b/configure_user.sh
@@ -47,31 +47,6 @@ configure_gpg() {
     fi
 }
 
-configure_git_gpg() {
-    [ ! -f ~/.gitconfig ] && return
-    ! command_exists git && return
-    [ -n "$(git config --global user.signingkey)" ] && return
-
-    if confirm_action "要配置 git 使用 gpg 签名吗？" "N"; then
-        if ! command_exists 7za; then
-            echo "7zip 未安装，请运行 sudo apt install p7zip-full 安装"
-            return
-        fi
-        read_password
-        cp $scriptdir/files/git.key.zip $tempdir/git.key.zip
-        7za x -p$password $tempdir/git.key.zip -o$tempdir > /dev/null 2>&1
-        rm $tempdir/git.key.zip
-        if [ ! -s $tempdir/git.key ]; then
-            echo "Wrong password!"
-            return
-        fi
-        gpg --import $tempdir/git.key
-        rm $tempdir/git.key
-        git config --global user.signingkey 4ACB54FB3EFF978038BFB374A523E440E24B89CF
-        git config --global commit.gpgSign true
-    fi
-}
-
 configure_miniconda() {
     [ -d ~/.miniconda3 ] && return
     [ $offline -eq 1 ] && return
@@ -136,7 +111,6 @@ configure_ssh
 configure_ssh_keygen
 configure_git
 configure_gpg
-configure_git_gpg
 configure_miniconda
 configure_miniforge
 configure_nvm