configure_priv.sh

@@ -484,19 +484,12 @@ configure_git_gpg() {
     [ -n "$(git config --global user.signingkey)" ] && return
 
     if confirm_action "要配置 git 使用 gpg 签名吗？" "N"; then
-        if [ "$(uname)" = "Darwin" ]; then
+        if ! command_exists 7za; then
-            if ! command_exists 7z; then
+            sudo apt install p7zip-full -y
-                brew install p7zip
-            fi
-        else
-            if ! command_exists 7za; then
-                sudo apt install p7zip-full -y
-                alias 7z=7za
-            fi
         fi
         read_password
         cp $scriptdir/files/git.key.zip $tempdir/git.key.zip
-        7z x -p$password $tempdir/git.key.zip -o$tempdir > /dev/null 2>&1
+        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!"

configure_user.sh

@@ -44,11 +44,6 @@ configure_gpg() {
         mkdir -p ~/.gnupg
         chmod 700 ~/.gnupg
         cp $scriptdir/files/gpg.conf ~/.gnupg/gpg.conf
-        if [ "$(uname)" = "Darwin" ]; then
-            if ! command_exists gpg; then
-                brew install gpg
-            fi
-        fi
     fi
 }