Pmodules/modulecmd.bash.in: conflict resolved

2026-07-14 00:50:52 +02:00 · 2018-01-24 14:35:16 +01:00
parent 610f784fdd 400c4246cb
commit 50f7c77883
1 changed files with 13 additions and 3 deletions
@@ -1931,13 +1931,23 @@ while (( $# > 0 )); do
 			opts+=( "$1" )
 			;;
 		* )
-			subcommand="$1"
 			if [[ -z "${Subcommands[$1]}" ]]; then
 			        std::die 1 "${CMD}: unknown sub-command -- $1"
 			fi
+			subcommand="$1"
 			shift
-			opts+=( "$@" )
-			shift $#
+			break
+			;;
+	esac
+	shift
+done
+
+while (( $# > 0 )); do
+	case "$1" in
+		-- )
+			;;
+		* )
+			opts+=( "$1" )
 			;;
 	esac
 	shift