From f767ec7e6a0d71a92c0fc3b7395d8b50681c91b4 Mon Sep 17 00:00:00 2001 From: dannc Date: Fri, 28 Jan 2022 09:46:48 +0700 Subject: [PATCH 1/2] merge: @ instead * --- src/homework/2.3/branching/merge.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/homework/2.3/branching/merge.sh b/src/homework/2.3/branching/merge.sh index 7cfffa7..f534246 100644 --- a/src/homework/2.3/branching/merge.sh +++ b/src/homework/2.3/branching/merge.sh @@ -2,7 +2,7 @@ # display command line options count=1 -for param in "$*"; do - echo "\$* Parameter #$count = $param" +for param in "$@"; do + echo "\$@ Parameter #$count = $param" count=$(( $count + 1 )) done \ No newline at end of file From b305eaa8779e8ffc183bdf156f0c12c92f7740da Mon Sep 17 00:00:00 2001 From: dannc Date: Fri, 28 Jan 2022 09:47:41 +0700 Subject: [PATCH 2/2] merge: use shift --- src/homework/2.3/branching/merge.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/homework/2.3/branching/merge.sh b/src/homework/2.3/branching/merge.sh index f534246..e5fc1a9 100644 --- a/src/homework/2.3/branching/merge.sh +++ b/src/homework/2.3/branching/merge.sh @@ -2,7 +2,8 @@ # display command line options count=1 -for param in "$@"; do - echo "\$@ Parameter #$count = $param" +while [[ -n "$1" ]]; do + echo "Parameter #$count = $1" count=$(( $count + 1 )) + shift done \ No newline at end of file