From b89dc654b25fb8e64ae1a398df1614c27ba16c99 Mon Sep 17 00:00:00 2001 From: Patrick McDermott Date: Sat, 27 Apr 2019 17:38:21 -0400 Subject: src/cmd/*.sh: Shift consistently --- diff --git a/src/cmd/help.sh b/src/cmd/help.sh index 51eade4..9c45382 100644 --- a/src/cmd/help.sh +++ b/src/cmd/help.sh @@ -24,6 +24,7 @@ cmd_help_main() if [ ${#} -eq 1 ]; then cmd="${1}" + shift 1 if is_cmd "${cmd}"; then print_cmd_usage "${cmd}" return 0 diff --git a/src/cmd/install.sh b/src/cmd/install.sh index b354f1b..69c5083 100644 --- a/src/cmd/install.sh +++ b/src/cmd/install.sh @@ -43,6 +43,7 @@ cmd_install_main() # profile. suite="${1}" root="${2}" + shift 2 if [ "x${suite%%:*}" != "x${suite}" ]; then profile="${suite%%:*}" diff --git a/src/cmd/installer-pc.sh b/src/cmd/installer-pc.sh index bb0410d..d85558b 100644 --- a/src/cmd/installer-pc.sh +++ b/src/cmd/installer-pc.sh @@ -24,6 +24,7 @@ _cmd_installer_pc_log_print() { local prefix="${1}" local log="${2}" + shift 2 local line= IFS="${LF}" @@ -36,6 +37,7 @@ _cmd_installer_pc_log_print() _cmd_installer_pc_make_partition_and_fs() { local dev="${1}" + shift 1 local log= info "$(get_msg 'cmd_installer_pc_dd')" @@ -104,6 +106,8 @@ cmd_installer_pc_main() suite="${1}" dev="${2}" + shift 2 + if ! check_block "${dev}"; then return 2 fi -- cgit v0.9.1