diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/library/parse_options.sh | 32 | ||||
| -rw-r--r-- | scripts/makepkg.sh.in | 10 | ||||
| -rw-r--r-- | scripts/pacman-key.sh.in | 6 | ||||
| -rw-r--r-- | scripts/pacman-optimize.sh.in | 3 |
4 files changed, 21 insertions, 30 deletions
diff --git a/scripts/library/parse_options.sh b/scripts/library/parse_options.sh index 48fd42cd..39038de6 100644 --- a/scripts/library/parse_options.sh +++ b/scripts/library/parse_options.sh @@ -23,17 +23,15 @@ parse_options() { [[ ${match} = ${1:2}:: && -n $2 && ${2:0:1} != "-" ]] && needsargument=1 if (( ! needsargument )); then - printf ' %s' "$1" + OPTRET+=("$1") else if [[ -n $2 ]]; then - printf ' %s ' "$1" + OPTRET+=("$1" "$2") shift - printf "'%q" "$1" while [[ -n $2 && ${2:0:1} != "-" ]]; do shift - printf " %q" "$1" + OPTRET+=("$1") done - printf "'" else printf "@SCRIPTNAME@: $(gettext "option %s requires an argument\n")" "'$1'" >&2 ret=1 @@ -57,26 +55,22 @@ parse_options() { ( -n ${1:$i+1} || ( -n $2 && ${2:0:1} != "-" ) ) ]] && needsargument=1 if (( ! needsargument )); then - printf ' -%s' "${1:i:1}" + OPTRET+=("-${1:i:1}") else if [[ -n ${1:$i+1} ]]; then - printf ' -%s ' "${1:i:1}" - printf "'%q" "${1:$i+1}" + OPTRET+=("-${1:i:1}" "${1:i+1}") while [[ -n $2 && ${2:0:1} != "-" ]]; do shift - printf " %q" "$1" + OPTRET+=("$1") done - printf "'" else if [[ -n $2 ]]; then - printf ' -%s ' "${1:i:1}" + OPTRET+=("-${1:i:1}" "$2") shift - printf "'%q" "$1" while [[ -n $2 && ${2:0:1} != "-" ]]; do shift - printf " %q" "$1" + OPTRET+=("$1") done - printf "'" else printf "@SCRIPTNAME@: $(gettext "option %s requires an argument\n")" "'-${1:i:1}'" >&2 @@ -91,15 +85,11 @@ parse_options() { fi done else - unused_options="${unused_options} '$1'" + unused_options+=("$1") fi shift done - printf " --" - [[ $unused_options ]] && printf ' %s' "${unused_options[@]}" - [[ $1 ]] && printf " '%s'" "$@" - printf "\n" - + OPTRET+=('--' "${unused_options[@]}") return $ret -}
\ No newline at end of file +} diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index aa98cfac..6e7a5562 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -36,6 +36,8 @@ export TEXTDOMAINDIR='@localedir@' # file -i does not work on Mac OSX unless legacy mode is set export COMMAND_MODE='legacy' +# Ensure CDPATH doesn't screw with our cd calls +unset CDPATH declare -r myver='@PACKAGE_VERSION@' declare -r confdir='@sysconfdir@' @@ -519,7 +521,7 @@ remove_deps() { local deplist deplist=($(grep -xvFf <(printf "%s\n" "${original_pkglist[@]}") \ <(printf "%s\n" "${current_pkglist[@]}") || true)) - if [[ -z deplist ]]; then + if [[ -z $deplist ]]; then return fi @@ -1924,11 +1926,11 @@ OPT_LONG+=",version,config:" # Pacman Options OPT_LONG+=",noconfirm,noprogressbar" -if ! OPT_TEMP="$(parse_options $OPT_SHORT $OPT_LONG "$@")"; then +if ! parse_options $OPT_SHORT $OPT_LONG "$@"; then echo; usage; exit 1 # E_INVALID_OPTION; fi -eval set -- "$OPT_TEMP" -unset OPT_SHORT OPT_LONG OPT_TEMP +set -- "${OPTRET[@]}" +unset OPT_SHORT OPT_LONG OPTRET while true; do case "$1" in diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index 12e0b1ab..c393370f 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -501,11 +501,11 @@ OPT_LONG="add::,config:,delete:,edit-key:,export::,finger::,gpgdir:" OPT_LONG+=",help,import:,import-trustdb:,init,keyserver:,list-keys::,list-sigs::" OPT_LONG+=",lsign-key:,populate::,recv-keys:,refresh-keys::,updatedb" OPT_LONG+=",verify:,version" -if ! OPT_TEMP="$(parse_options $OPT_SHORT $OPT_LONG "$@")"; then +if ! parse_options $OPT_SHORT $OPT_LONG "$@"; then echo; usage; exit 1 # E_INVALID_OPTION; fi -eval set -- "$OPT_TEMP" -unset OPT_SHORT OPT_LONG OPT_TEMP +set -- "${OPTRET[@]}" +unset OPT_SHORT OPT_LONG OPTRET if [[ $1 == "--" ]]; then usage; diff --git a/scripts/pacman-optimize.sh.in b/scripts/pacman-optimize.sh.in index 3c6cfa88..d80435c0 100644 --- a/scripts/pacman-optimize.sh.in +++ b/scripts/pacman-optimize.sh.in @@ -122,8 +122,7 @@ find "$dbroot" -type f | sort | xargs md5sum > "$workdir/pacsums.old" # step 2: tar it up msg "$(gettext "Tar'ing up %s...")" "$dbroot" -cd "$dbroot" -bsdtar -czf "$workdir/pacman-db.tar.gz" ./ +bsdtar -czf "$workdir/pacman-db.tar.gz" -C "$dbroot" ./ if (( $? )); then rm -rf "$workdir" die_r "$(gettext "Tar'ing up %s failed.")" "$dbroot" |