d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a syntax error when running under bash(1) for portability.

Browse Source
This commit is contained in:
Devin Teske 2014-07-31 22:05:18 +00:00
parent 4d5a468d88
commit 13243ba9b2
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=269352
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
usr.sbin/bsdconfig/share/dialog.subr
View File

@ -2099,9 +2099,13 @@ f_dialog_init()
# #
# Process stored command-line arguments # Process stored command-line arguments
# #
# NB: Using backticks instead of $(...) for portability since Linux
# bash(1) balks at the right parentheses encountered in the case-
# statement (incorrectly interpreting it as the close of $(...)).
#
f_dprintf "f_dialog_init: ARGV=[%s] GETOPTS_STDARGS=[%s]" \ f_dprintf "f_dialog_init: ARGV=[%s] GETOPTS_STDARGS=[%s]" \
"$ARGV" "$GETOPTS_STDARGS" "$ARGV" "$GETOPTS_STDARGS"
SECURE=$( set -- $ARGV SECURE=`set -- $ARGV
while getopts \ while getopts \
"$GETOPTS_STDARGS$GETOPTS_EXTRA$GETOPTS_ALLFLAGS" \ "$GETOPTS_STDARGS$GETOPTS_EXTRA$GETOPTS_ALLFLAGS" \
flag > /dev/null; do flag > /dev/null; do
@ -2109,8 +2113,8 @@ f_dialog_init()
S) echo 1 ;; S) echo 1 ;;
esac esac
done done
) ` # END-BACKTICK
USE_XDIALOG=$( set -- $ARGV USE_XDIALOG=`set -- $ARGV
while getopts \ while getopts \
"$GETOPTS_STDARGS$GETOPTS_EXTRA$GETOPTS_ALLFLAGS" \ "$GETOPTS_STDARGS$GETOPTS_EXTRA$GETOPTS_ALLFLAGS" \
flag > /dev/null; do flag > /dev/null; do
@ -2118,7 +2122,7 @@ f_dialog_init()
S|X) echo 1 ;; S|X) echo 1 ;;
esac esac
done done
) ` # END-BACKTICK
f_dprintf "f_dialog_init: SECURE=[%s] USE_XDIALOG=[%s]" \ f_dprintf "f_dialog_init: SECURE=[%s] USE_XDIALOG=[%s]" \
"$SECURE" "$USE_XDIALOG" "$SECURE" "$USE_XDIALOG"