Fix argmuent parsing for gwms-factory upgrade

glideinWMS · Jul 28, 2023 · 3fd4834 · 3fd4834
1 parent 69eea68
commit 3fd4834
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 51 deletions.
diff --git a/creation/templates/factory_initd_startup_template b/creation/templates/factory_initd_startup_template
@@ -473,23 +473,21 @@ upgrade() {
  writeback=$DEFAULT_WRITEBACK
  force_delete=""
  fix_rrd=""
- if [ -n "$@" ]; then
- for var in "$@"
- do
- case "$var" in
- yes | no) writeback="$var"
- ;;
- "-force_delete") force_delete="-force_delete"
- ;;
- "-fix_rrd") fix_rrd="-fix_rrd"
- ;;
- *) echo "Invalid option: $var"
- help_usage
- exit 2
- ;;
- esac
- done
- fi
+ for var in "$@"
+ do
+ case "$var" in
+ yes | no) writeback="$var"
+ ;;
+ "-force_delete") force_delete="-force_delete"
+ ;;
+ "-fix_rrd") fix_rrd="-fix_rrd"
+ ;;
+ *) echo "Invalid option: $var"
+ help_usage
+ exit 2
+ ;;
+ esac
+ done
 
  pushd $factory_dir 1>/dev/null
  if [ "$RPM_INSTALL" = "True" ]; then

diff --git a/creation/templates/factory_initd_startup_template_sl7 b/creation/templates/factory_initd_startup_template_sl7
@@ -467,23 +467,21 @@ upgrade() {
  writeback=$DEFAULT_WRITEBACK
  force_delete=""
  fix_rrd=""
- if [ -n "$@" ]; then
- for var in "$@"
- do
- case "$var" in
- yes | no) writeback="$var"
- ;;
- "-force_delete") force_delete="-force_delete"
- ;;
- "-fix_rrd") fix_rrd="-fix_rrd"
- ;;
- *) echo "Invalid option: $var"
- help_usage
- exit 2
- ;;
- esac
- done
- fi
+ for var in "$@"
+ do
+ case "$var" in
+ yes | no) writeback="$var"
+ ;;
+ "-force_delete") force_delete="-force_delete"
+ ;;
+ "-fix_rrd") fix_rrd="-fix_rrd"
+ ;;
+ *) echo "Invalid option: $var"
+ help_usage
+ exit 2
+ ;;
+ esac
+ done
 
  pushd $factory_dir 1>/dev/null
  if [ "$RPM_INSTALL" = "True" ]; then

diff --git a/unittests/fixtures/factory/work-dir/factory_startup b/unittests/fixtures/factory/work-dir/factory_startup
@@ -466,23 +466,21 @@ upgrade() {
  writeback=$DEFAULT_WRITEBACK
  force_delete=""
  fix_rrd=""
- if [ -n "$@" ]; then
- for var in "$@"
- do
- case "$var" in
- yes | no) writeback="$var"
- ;;
- "-force_delete") force_delete="-force_delete"
- ;;
- "-fix_rrd") fix_rrd="-fix_rrd"
- ;;
- *) echo "Invalid option: $var"
- help_usage
- exit 2
- ;;
- esac
- done
- fi
+ for var in "$@"
+ do
+ case "$var" in
+ yes | no) writeback="$var"
+ ;;
+ "-force_delete") force_delete="-force_delete"
+ ;;
+ "-fix_rrd") fix_rrd="-fix_rrd"
+ ;;
+ *) echo "Invalid option: $var"
+ help_usage
+ exit 2
+ ;;
+ esac
+ done
 
  pushd $factory_dir 1>/dev/null
  if [ "$RPM_INSTALL" = "True" ]; then