File tree Expand file tree Collapse file tree 14 files changed +41
-57
lines changed
channels/i3/airootfs.any/etc/skel/.config/rofi
modules/lightdm/airootfs.any/root Expand file tree Collapse file tree 14 files changed +41
-57
lines changed Original file line number Diff line number Diff line change @@ -22,7 +22,7 @@ declare -A menu_list=(
2222
2323function main() {
2424 local -r IFS=$' \n '
25- [[ $# -ne 0 ]] && eval " ${menu_list[$1]} " || echo " ${! menu_list[*]} "
25+ [[ " ${ # } " -ne 0 ]] && eval " ${menu_list[$1]} " || echo " ${! menu_list[*]} "
2626}
2727
28- main $@
28+ main " ${ @ } "
Original file line number Diff line number Diff line change @@ -34,7 +34,7 @@ if [[ -f "/etc/lightdm/lightdm.conf.d/02-autologin-session.conf" ]] && cat "/etc
3434 else
3535 echo " Failed to set the session.Multiple sessions were found." >&2
3636 echo " Please set the session of automatic login in /etc/lightdm/lightdm.conf.d/02-autologin-session.conf"
37- echo " Found session: $( printf " %s " ${session_list[@]} ) "
37+ echo " Found session: $( printf " %s " " ${session_list[@]} " ) "
3838 sleep 0.5
3939 exit 1
4040 fi
Original file line number Diff line number Diff line change @@ -66,7 +66,7 @@ function user_check () {
6666
6767# 一般ユーザーで実行します
6868function run_user () {
69- sudo -u " ${build_username} " ${@ }
69+ sudo -u " ${build_username} " " ${@ } "
7070}
7171
7272# 引数を確認
@@ -106,12 +106,12 @@ pacman -Syy "${pacman_args[@]}"
106106cd " ${pkgbuild_dir} "
107107pkgbuild_dirs=($( ls " ${pkgbuild_dir} " 2> /dev/null) )
108108if (( "${# pkgbuild_dirs[@]} " != 0 )) ; then
109- for _dir in ${pkgbuild_dirs[@]} ; do
109+ for _dir in " ${pkgbuild_dirs[@]} " ; do
110110 cd " ${_dir} "
111111 depends=($( source " ${pkgbuild_dir} /${_dir} /PKGBUILD" ; echo " ${depends[@]} " ) )
112112 makedepends=($( source " ${pkgbuild_dir} /${_dir} /PKGBUILD" ; echo " ${makedepends[@]} " ) )
113113 if (( ${# depends[@]} + ${# makedepends[@]} != 0 )) ; then
114- for _pkg in ${depends[@]} ${makedepends[@]} ; do
114+ for _pkg in " ${depends[@]} " " ${makedepends[@]} " ; do
115115 if pacman -Ssq " ${_pkg} " | grep -x " ${_pkg} " 1> /dev/null; then
116116 pacman -S --asdeps --needed " ${pacman_args[@]} " " ${_pkg} "
117117 fi
Original file line number Diff line number Diff line change 7979
8080load_config () {
8181 local _file
82- for _file in ${@ } ; do
82+ for _file in " ${@ } " ; do
8383 if [[ -f " ${_file} " ]]; then
8484 source " ${_file} "
8585 fi
@@ -89,7 +89,7 @@ load_config() {
8989for_module (){
9090 local module
9191 for module in ${modules[@]} ; do
92- eval $( echo ${@ } | sed " s|{}|${module} |g" )
92+ eval $( echo " ${@ } " | sed " s|{}|${module} |g" )
9393 done
9494}
9595
@@ -105,7 +105,7 @@ for arch in ${archs[@]}; do
105105 modules=(" share" )
106106 fi
107107 fi
108- for module in ${modules[@]} ; do
108+ for module in " ${modules[@]} " ; do
109109 dependent=" ${module_dir} /${module} /dependent"
110110 if [[ -f " ${dependent} " ]]; then
111111 modules+=($( grep -h -v ^' #' " ${dependent} " | tr -d " \n" ) )
Original file line number Diff line number Diff line change @@ -97,7 +97,7 @@ variable_list=(
9797 " iso_version"
9898)
9999
100- for var in ${variable_list[@]} ; do
100+ for var in " ${variable_list[@]} " ; do
101101 if [[ -z " $( eval echo ' $' ${var} ) " ]]; then
102102 echo " ${var} is empty" >&2
103103 exit 1
Original file line number Diff line number Diff line change @@ -237,10 +237,10 @@ else
237237fi
238238
239239case " ${mode} " in
240- " check" ) check ${@ } ;;
240+ " check" ) check " ${@ } " ;;
241241 " show" ) show ;;
242- " desc" ) desc ${@ } ;;
243- " ver" ) get_alteriso_version ${@ } ;;
242+ " desc" ) desc " ${@ } " ;;
243+ " ver" ) get_alteriso_version " ${@ } " ;;
244244 " help" ) _help; exit 0 ;;
245245 * ) _help; exit 1 ;;
246246esac
Original file line number Diff line number Diff line change @@ -14,7 +14,7 @@ noconfirm=false
1414# load_config [file1] [file2] ...
1515load_config () {
1616 local _file
17- for _file in ${@ } ; do
17+ for _file in " ${@ } " ; do
1818 if [[ -f " ${_file} " ]]; then
1919 source " ${_file} "
2020 fi
Original file line number Diff line number Diff line change @@ -6,25 +6,9 @@ arch_list=(
66 " i686"
77)
88
9- # rm helper
10- # Delete the file if it exists.
11- # For directories, rm -rf is used.
12- # If the file does not exist, skip it.
13- # remove <file> <file> ...
14- remove () {
15- local _list=($( echo " $@ " ) ) _file
16- for _file in " ${_list[@]} " ; do
17- if [[ -f " ${_file} " ]]; then
18- rm -f " ${_file} "
19- elif [[ -d " ${_file} " ]]; then
20- rm -rf " ${_file} "
21- fi
22- done
23- }
24-
259# cd "${script_path}"
26- for arch in ${arch_list[@]} ; do
27- remove " ${script_path} /menuconfig-script/kernel_choice_${arch} "
10+ for arch in " ${arch_list[@]} " ; do
11+ rm -rf " ${script_path} /menuconfig-script/kernel_choice_${arch} "
2812 for kernel in $( bash " ${script_path} /tools/kernel.sh" -a " ${arch} " show ) ; do
2913 echo " config KERNEL_N_A_M_E_${kernel} " >> " ${script_path} /menuconfig-script/kernel_choice_${arch} "
3014 echo -e " \tbool ${kernel} " >> " ${script_path} /menuconfig-script/kernel_choice_${arch} "
Original file line number Diff line number Diff line change @@ -101,7 +101,7 @@ get() {
101101 _kernel_name_list=($( cat " ${_kernel_config_file} " | grep -h -v ^' #' | getclm 1) )
102102 _get_kernel_line () {
103103 local _kernel _count=0
104- for _kernel in ${_kernel_name_list[@]} ; do
104+ for _kernel in " ${_kernel_name_list[@]} " ; do
105105 _count=$(( _count + 1 ))
106106 if [[ " ${_kernel} " = " ${1} " ]]; then echo " ${_count} " ; return 0; fi
107107 done
175175fi
176176
177177case " ${mode} " in
178- " check" ) check ${@ } ;;
178+ " check" ) check " ${@ } " ;;
179179 " show" ) show ;;
180- " get" ) get ${@ } ;;
180+ " get" ) get " ${@ } " ;;
181181 " help" ) _help; exit 0 ;;
182182 * ) _help; exit 1 ;;
183183esac
Original file line number Diff line number Diff line change @@ -171,7 +171,7 @@ checkpkg() {
171171
172172run () {
173173 msg_info " Running ${* } "
174- ${@ }
174+ eval " ${@ } "
175175}
176176
177177
You can’t perform that action at this time.
0 commit comments