Merge branch 'develop' into main

ver_1.1.2
1. fix some scripts can't run by using all_setup.sh.
2. update vscode apt script.

Author: tw-yshuang

all_setup.sh

@@ -22,19 +22,20 @@ function Echo_Color(){
 }
 
 
-all_accept = -y
+all_accept=-y
 
 if [[ $SHELL != *zsh ]]; then
-  chmod +x package.sh zsh_ohmyzsh_setup.sh ohmyzsh_config.sh terminal_config.sh application.sh pyenv_setup.sh nvm_setup.sh
+  chmod +x package.sh zsh_ohmyzsh_setup.sh ohmyzsh_config.sh
   ./package.sh $all_accept
   ./zsh_ohmyzsh_setup.sh
   ./ohmyzsh_config.sh $all_accept
   Echo_Color g "Completed ZSH setup"
   Echo_Color y "relogin and execute this script again!!"
 else
+  chmod +x terminal_config.sh application.sh language_package.sh custom_function.sh 
   ./terminal_config.sh $all_accept
   ./application.sh $all_accept
   ./language_package.sh $all_accept
-  ./custom_functions.sh $all_accept
+  ./custom_function.sh $all_accept
   Echo_Color g "All Done~~~"
 fi

application.sh

@@ -70,7 +70,7 @@ function Echo_Color(){
 function Ask_yn(){
     printf "\e[33m$1\e[0m\e[33m [y/n] \e[0m"
     if [ $all_accept = 1 ]; then
-        printf "-y\n"
+        echo '-y'
         return 1
     fi
     read respond
@@ -102,13 +102,13 @@ for key in ${!Application_dict[*]}; do
         if [ $result = 1 ]; then
             case ${Application_dict[$key]} in 
                 "VScode" ) # install VScode
-                    wget -qO- https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > ./packages.microsoft.gpg
-                    sudo install -o root -g root -m 644 ./packages.microsoft.gpg /etc/apt/trusted.gpg.d/
-                    sudo sh -c 'echo "deb [arch=amd64 signed-by=/etc/apt/trusted.gpg.d/packages.microsoft.gpg] https://packages.microsoft.com/repos/vscode stable main" > /etc/apt/sources.list.d/vscode.list'
-                    sudo apt-get install apt-transport-https -y
-                    sudo apt-get update
-                    sudo apt-get install code -y
-                    rm ./packages.microsoft.gpg
+                    wget -qO- https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > packages.microsoft.gpg
+                    sudo install -o root -g root -m 644 packages.microsoft.gpg /etc/apt/trusted.gpg.d/
+                    sudo sh -c 'echo "deb [arch=amd64,arm64,armhf signed-by=/etc/apt/trusted.gpg.d/packages.microsoft.gpg] https://packages.microsoft.com/repos/code stable main" > /etc/apt/sources.list.d/vscode.list'
+                    rm -f packages.microsoft.gpg
+                    sudo apt install apt-transport-https -y
+                    sudo apt update
+                    sudo apt install code -y
                     ;;
                 "Chrome" ) # install Chrome
                     wget -c https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb

custom_funciton.sh renamed to custom_function.sh

@@ -89,7 +89,7 @@ function Echo_Color(){
 function Ask_yn(){
     printf "\e[33m$1\e[0m\e[33m [y/n] \e[0m"
     if [ $all_accept = 1 ]; then
-        printf "-y\n"
+        echo '-y'
         return 1
     fi
     read respond

language_package.sh

@@ -74,7 +74,7 @@ function Echo_Color(){
 function Ask_yn(){
     printf "\e[33m$1\e[0m\e[33m [y/n] \e[0m"
     if [ $all_accept = 1 ]; then
-        printf "-y\n"
+        echo '-y'
         return 1
     fi
     read respond

ohmyzsh_config.sh

@@ -70,7 +70,7 @@ function Echo_Color(){
 function Ask_yn(){
     printf "\e[33m$1\e[0m\e[33m [y/n] \e[0m"
     if [ $all_accept = 1 ]; then
-        printf "-y\n"
+        echo '-y'
         return 1
     fi
     read respond

package.sh

@@ -128,7 +128,7 @@ function Echo_Color(){
 function Ask_yn(){
     printf "\e[33m$1\e[0m\e[33m [y/n] \e[0m"
     if [ $all_accept = 1 ]; then
-        printf "-y\n"
+        echo '-y'
         return 1
     fi
     read respond

terminal_config.sh

@@ -70,7 +70,7 @@ function Echo_Color(){
 function Ask_yn(){
     printf "\e[33m$1\e[0m\e[33m [y/n] \e[0m"
     if [ $all_accept = 1 ]; then
-        printf "-y\n"
+        echo '-y'
         return 1
     fi
     read respond