Use $(..) instead of legacy ..
https://github.com/koalaman/shellcheck/wiki/SC2006 modified: scripts/web-add.sh
This commit is contained in:
parent
97bad77040
commit
e596e3d520
|
@ -597,7 +597,7 @@ op_del() {
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -d "$HOME_DIR/$login" ]; then
|
if [ -d "$HOME_DIR/$login" ]; then
|
||||||
mv -i $HOME_DIR/$login $HOME_DIR/$login.`date '+%Y%m%d-%H%M%S'`.bak
|
mv -i $HOME_DIR/"$login" $HOME_DIR/"$login"."$(date '+%Y%m%d-%H%M%S')".bak
|
||||||
else
|
else
|
||||||
echo "warning : $HOME_DIR/$login does not exist"
|
echo "warning : $HOME_DIR/$login does not exist"
|
||||||
fi
|
fi
|
||||||
|
@ -723,11 +723,11 @@ op_listvhost() {
|
||||||
|
|
||||||
|
|
||||||
for configfile in $configlist; do
|
for configfile in $configlist; do
|
||||||
if [ -r "$configfile" ] && echo "$configfile" |grep -qvE "/(000-default|default-ssl)\.conf$"; then
|
if [ -r "$configfile" ] && echo "$configfile" |grep -qvE "/(000-default|default-ssl)\\.conf$"; then
|
||||||
servername=`awk '/^[[:space:]]*ServerName (.*)/ { print $2 }' $configfile | head -n 1`
|
servername="$(awk '/^[[:space:]]*ServerName (.*)/ { print $2 }' "$configfile" | head -n 1)"
|
||||||
serveraliases=`perl -ne 'print "$1 " if /^[[:space:]]*ServerAlias (.*)/' $configfile | head -n 1`
|
serveraliases="$(perl -ne 'print "$1 " if /^[[:space:]]*ServerAlias (.*)/' "$configfile" | head -n 1)"
|
||||||
serveraliases=`echo $serveraliases | sed 's/ \+/,/g'`
|
serveraliases="${serveraliases// \+/,}"
|
||||||
userid=`awk '/^[[:space:]]*AssignUserID.*/ { print $3 }' $configfile | head -n 1`
|
userid="$(awk '/^[[:space:]]*AssignUserID.*/ { print $3 }' "$configfile" | head -n 1)"
|
||||||
if [ -x /usr/bin/quota ]; then
|
if [ -x /usr/bin/quota ]; then
|
||||||
size=$(quota --no-wrap --human-readable "$userid" |grep /home |awk '{print $2}')
|
size=$(quota --no-wrap --human-readable "$userid" |grep /home |awk '{print $2}')
|
||||||
quota_soft=$(quota --no-wrap --human-readable "$userid" |grep /home |awk '{print $3}')
|
quota_soft=$(quota --no-wrap --human-readable "$userid" |grep /home |awk '{print $3}')
|
||||||
|
@ -740,7 +740,7 @@ op_listvhost() {
|
||||||
is_enabled=0
|
is_enabled=0
|
||||||
fi
|
fi
|
||||||
if [ "$servername" ] && [ "$userid" ]; then
|
if [ "$servername" ] && [ "$userid" ]; then
|
||||||
configid=`basename $configfile`
|
configid=$(basename "$configfile")
|
||||||
echo "$userid:$configid:$servername:$serveraliases:$size:$quota_soft:$quota_hard:$phpversion:$is_enabled"
|
echo "$userid:$configid:$servername:$serveraliases:$size:$quota_soft:$quota_hard:$phpversion:$is_enabled"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
@ -799,7 +799,7 @@ op_add() {
|
||||||
echo
|
echo
|
||||||
|
|
||||||
if [ -z "$tmp" ]; then
|
if [ -z "$tmp" ]; then
|
||||||
tmp=`gen_random_passwd`
|
tmp=$(gen_random_passwd)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if validate_passwd "$tmp"; then
|
if validate_passwd "$tmp"; then
|
||||||
|
@ -830,7 +830,7 @@ op_add() {
|
||||||
echo
|
echo
|
||||||
|
|
||||||
if [ -z "$tmp" ]; then
|
if [ -z "$tmp" ]; then
|
||||||
tmp=`gen_random_passwd`
|
tmp=$(gen_random_passwd)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if validate_passwd "$tmp"; then
|
if validate_passwd "$tmp"; then
|
||||||
|
@ -925,13 +925,13 @@ op_add() {
|
||||||
else
|
else
|
||||||
in_login=$1
|
in_login=$1
|
||||||
in_wwwdomain=$2
|
in_wwwdomain=$2
|
||||||
validate_login $in_login || exit 1
|
validate_login "$in_login" || exit 1
|
||||||
[ -z "$in_passwd" ] && [ -z "$in_sshkey" ] && in_passwd=`gen_random_passwd`
|
[ -z "$in_passwd" ] && [ -z "$in_sshkey" ] && in_passwd=$(gen_random_passwd)
|
||||||
[ -z "$in_sshkey" ] && ( validate_passwd $in_passwd || exit 1 )
|
[ -z "$in_sshkey" ] && ( validate_passwd "$in_passwd" || exit 1 )
|
||||||
[ -n "$in_dbname" ] && ( validate_dbname $in_dbname || exit 1 )
|
[ -n "$in_dbname" ] && ( validate_dbname "$in_dbname" || exit 1 )
|
||||||
[ -z "$in_dbpasswd" ] && [ -n "$in_dbname" ] && in_dbpasswd=`gen_random_passwd`
|
[ -z "$in_dbpasswd" ] && [ -n "$in_dbname" ] && in_dbpasswd=$(gen_random_passwd)
|
||||||
[ -n "$in_dbname" ] && ( validate_passwd $in_dbpasswd || exit 1 )
|
[ -n "$in_dbname" ] && ( validate_passwd "$in_dbpasswd" || exit 1 )
|
||||||
validate_wwwdomain $in_wwwdomain || exit 1
|
validate_wwwdomain "$in_wwwdomain" || exit 1
|
||||||
[ -z "$in_mail" ] && in_mail=$CONTACT_MAIL
|
[ -z "$in_mail" ] && in_mail=$CONTACT_MAIL
|
||||||
validate_mail $in_mail || exit 1
|
validate_mail $in_mail || exit 1
|
||||||
[ -n "$in_phpversion" ] && (validate_phpversion "$in_phpversion" || exit 1)
|
[ -n "$in_phpversion" ] && (validate_phpversion "$in_phpversion" || exit 1)
|
||||||
|
|
Loading…
Reference in a new issue