Skip to content

Commit 638ce5c

Browse files
tw-yshuangtw-yshuang
committed
Merge branch 'develop'
2 parents 912a019 + 3018a21 commit 638ce5c

File tree

8 files changed

+65
-63
lines changed

8 files changed

+65
-63
lines changed

‎.DS_Store‎

8 KB
Binary file not shown.

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
test*

‎all_setup.sh‎

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,26 @@
11
#!/usr/bin/env bash
22

33
function Echo_Color(){
4-
case $1 in
5-
r* | R* )
6-
COLOR='\e[31m'
7-
;;
8-
g* | G* )
9-
COLOR='\e[32m'
10-
;;
11-
y* | Y* )
12-
COLOR='\e[33m'
13-
;;
14-
b* | B* )
15-
COLOR='\e[34m'
16-
;;
17-
*)
18-
echo "$COLOR Wrong COLOR keyword!\e[0m"
19-
;;
4+
case $1 in
5+
r* | R* )
6+
COLOR='\033[0;31m'
7+
;;
8+
g* | G* )
9+
COLOR='\033[0;32m'
10+
;;
11+
y* | Y* )
12+
COLOR='\033[0;33m'
13+
;;
14+
b* | B* )
15+
COLOR='\033[0;34m'
16+
;;
17+
*)
18+
echo "$COLOR Wrong COLOR keyword!\033[0m"
19+
;;
2020
esac
21-
echo -e "$COLOR$2\e[0m"
22-
}
21+
echo -e "$COLOR$2\033[0m"
22+
}
23+
2324

2425

2526
all_accept=-y

‎application.sh‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,26 +49,26 @@ fi
4949
function Echo_Color(){
5050
case $1 in
5151
r* | R* )
52-
COLOR='\e[31m'
52+
COLOR='\033[0;31m'
5353
;;
5454
g* | G* )
55-
COLOR='\e[32m'
55+
COLOR='\033[0;32m'
5656
;;
5757
y* | Y* )
58-
COLOR='\e[33m'
58+
COLOR='\033[0;33m'
5959
;;
6060
b* | B* )
61-
COLOR='\e[34m'
61+
COLOR='\033[0;34m'
6262
;;
6363
*)
64-
echo "$COLOR Wrong COLOR keyword!\e[0m"
64+
echo "$COLOR Wrong COLOR keyword!\033[0m"
6565
;;
66-
esac
67-
echo -e "$COLOR$2\e[0m"
68-
}
66+
esac
67+
echo -e "$COLOR$2\033[0m"
68+
}
6969

7070
function Ask_yn(){
71-
printf "\e[33m$1\e[0m\e[33m [y/n] \e[0m"
71+
printf "\033[0;33m$1\033[0m\033[0;33m [y/n] \033[0m"
7272
if [ $all_accept = 1 ]; then
7373
echo '-y'
7474
return 1

‎custom_function.sh‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -68,26 +68,26 @@ declare -A funcs_info=([nvm]=$no_nvm [pipenv_correspond]=$no_pipenv_correspond)
6868
function Echo_Color(){
6969
case $1 in
7070
r* | R* )
71-
COLOR='\e[31m'
71+
COLOR='\033[0;31m'
7272
;;
7373
g* | G* )
74-
COLOR='\e[32m'
74+
COLOR='\033[0;32m'
7575
;;
7676
y* | Y* )
77-
COLOR='\e[33m'
77+
COLOR='\033[0;33m'
7878
;;
7979
b* | B* )
80-
COLOR='\e[34m'
80+
COLOR='\033[0;34m'
8181
;;
8282
*)
83-
echo "$COLOR Wrong COLOR keyword!\e[0m"
83+
echo "$COLOR Wrong COLOR keyword!\033[0m"
8484
;;
85-
esac
86-
echo -e "$COLOR$2\e[0m"
87-
}
85+
esac
86+
echo -e "$COLOR$2\033[0m"
87+
}
8888

8989
function Ask_yn(){
90-
printf "\e[33m$1\e[0m\e[33m [y/n] \e[0m"
90+
printf "\033[0;33m$1\033[0m\033[0;33m [y/n] \033[0m"
9191
if [ $all_accept = 1 ]; then
9292
echo '-y'
9393
return 1

‎language_package.sh‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -53,26 +53,26 @@ fi
5353
function Echo_Color(){
5454
case $1 in
5555
r* | R* )
56-
COLOR='\e[31m'
56+
COLOR='\033[0;31m'
5757
;;
5858
g* | G* )
59-
COLOR='\e[32m'
59+
COLOR='\033[0;32m'
6060
;;
6161
y* | Y* )
62-
COLOR='\e[33m'
62+
COLOR='\033[0;33m'
6363
;;
6464
b* | B* )
65-
COLOR='\e[34m'
65+
COLOR='\033[0;34m'
6666
;;
6767
*)
68-
echo "$COLOR Wrong COLOR keyword!\e[0m"
68+
echo "$COLOR Wrong COLOR keyword!\033[0m"
6969
;;
70-
esac
71-
echo -e "$COLOR$2\e[0m"
72-
}
70+
esac
71+
echo -e "$COLOR$2\033[0m"
72+
}
7373

7474
function Ask_yn(){
75-
printf "\e[33m$1\e[0m\e[33m [y/n] \e[0m"
75+
printf "\033[0;33m$1\033[0m\033[0;33m [y/n] \033[0m"
7676
if [ $all_accept = 1 ]; then
7777
echo '-y'
7878
return 1

‎package.sh‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -107,26 +107,26 @@ Extra_package_dict=([openssh-server]=$ssh_server [python3-pip]=$pip3)
107107
function Echo_Color(){
108108
case $1 in
109109
r* | R* )
110-
COLOR='\e[31m'
110+
COLOR='\033[0;31m'
111111
;;
112112
g* | G* )
113-
COLOR='\e[32m'
113+
COLOR='\033[0;32m'
114114
;;
115115
y* | Y* )
116-
COLOR='\e[33m'
116+
COLOR='\033[0;33m'
117117
;;
118118
b* | B* )
119-
COLOR='\e[34m'
119+
COLOR='\033[0;34m'
120120
;;
121121
*)
122-
echo "$COLOR Wrong COLOR keyword!\e[0m"
122+
echo "$COLOR Wrong COLOR keyword!\033[0m"
123123
;;
124-
esac
125-
echo -e "$COLOR$2\e[0m"
126-
}
124+
esac
125+
echo -e "$COLOR$2\033[0m"
126+
}
127127

128128
function Ask_yn(){
129-
printf "\e[33m$1\e[0m\e[33m [y/n] \e[0m"
129+
printf "\033[0;33m$1\033[0m\033[0;33m [y/n] \033[0m"
130130
if [ $all_accept = 1 ]; then
131131
echo '-y'
132132
return 1

‎terminal_config.sh‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,26 +49,26 @@ fi
4949
function Echo_Color(){
5050
case $1 in
5151
r* | R* )
52-
COLOR='\e[31m'
52+
COLOR='\033[0;31m'
5353
;;
5454
g* | G* )
55-
COLOR='\e[32m'
55+
COLOR='\033[0;32m'
5656
;;
5757
y* | Y* )
58-
COLOR='\e[33m'
58+
COLOR='\033[0;33m'
5959
;;
6060
b* | B* )
61-
COLOR='\e[34m'
61+
COLOR='\033[0;34m'
6262
;;
6363
*)
64-
echo "$COLOR Wrong COLOR keyword!\e[0m"
64+
echo "$COLOR Wrong COLOR keyword!\033[0m"
6565
;;
66-
esac
67-
echo -e "$COLOR$2\e[0m"
68-
}
66+
esac
67+
echo -e "$COLOR$2\033[0m"
68+
}
6969

7070
function Ask_yn(){
71-
printf "\e[33m$1\e[0m\e[33m [y/n] \e[0m"
71+
printf "\033[0;33m$1\033[0m\033[0;33m [y/n] \033[0m"
7272
if [ $all_accept = 1 ]; then
7373
echo '-y'
7474
return 1

0 commit comments

Comments
 (0)