slitaz-base-files diff rootfs/lib/libtaz.sh @ rev 278
libtaz.sh: fix more importing cases; add test for importing using libtaz.sh
author | Aleksej Bobylev <al.bobylev@gmail.com> |
---|---|
date | Sat Jun 20 22:49:35 2015 +0300 (2015-06-20) |
parents | c3e5c8e74be3 |
children | 3a790a182103 |
line diff
1.1 --- a/rootfs/lib/libtaz.sh Thu Jun 18 21:52:33 2015 +0300 1.2 +++ b/rootfs/lib/libtaz.sh Sat Jun 20 22:49:35 2015 +0300 1.3 @@ -28,18 +28,12 @@ 1.4 1.5 # Parse cmdline options and store values in a variable. 1.6 for opt in "$@"; do 1.7 + opt_name="${opt%%=*}"; opt_name="$(echo -n "${opt_name#--}" | tr -c 'a-zA-Z0-9' '_')" 1.8 case "$opt" in 1.9 - --*=*) 1.10 - opt_name="${opt%%=*}"; opt_name="$(echo -n "${opt_name#--}" | tr -c 'a-zA-Z0-9' '_')" 1.11 - case "$opt_name" in 1.12 - [0-9]*) opt_name="_$opt_name";; 1.13 - esac 1.14 - opt_value="${opt#--}="; opt_value="${opt_value#*=}"; opt_value="${opt_value%=}" 1.15 - export "$opt_name=$opt_value" 1.16 - ;; 1.17 - --*) 1.18 - export "${opt#--}=yes" 1.19 - ;; 1.20 + --[0-9]*=*) export _$opt_name="${opt#*=}" ;; 1.21 + --[0-9]*) export _$opt_name=yes ;; 1.22 + --*=*) export $opt_name="${opt#*=}" ;; 1.23 + --*) export $opt_name=yes ;; 1.24 esac 1.25 done 1.26 [ "$HTTP_REFERER" ] && output='html' 1.27 @@ -222,7 +216,7 @@ 1.28 action() { 1.29 case $output in 1.30 raw|gtk|html) _n "$@";; 1.31 - *) echo -ne "\033[0;33m"$(_ "$@")"\033[0m";; 1.32 + *) echo -ne "\033[0;33m$(_ "$@")\033[0m";; 1.33 esac 1.34 } 1.35