fixing bug with set-session in bash and zsh

reubenmiller · Oct 4, 2020 · 50722c0 · 50722c0
1 parent a29508f
commit 50722c0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+#### Bugfixes
+
+* Fixed bug when using `set-session "my filter"` in bash and zsh profiles which resulted in an "unknown flag" error
+
 ## Released
 
 ### v1.5.0

diff --git a/tools/bash/c8y.plugin.zsh b/tools/bash/c8y.plugin.zsh
@@ -15,19 +15,18 @@
 #   set-session
 #
 set-session () {
-    args=""
     if [ $# -gt 0 ]; then
-        args="--sessionFilter \"$@\""
+        resp=$( c8y sessions list --sessionFilter "$1 $2 $3 $4 $5" )
+    else
+        resp=$( c8y sessions list )
     fi
-    echo "c8y sessions list $args"
-    resp=$( c8y sessions list $args)
 
     if [ $? -ne 0 ]; then
         echo "Set session aborted"
         return
     fi
 
-    export C8Y_SESSION=$( c8y sessions list $args)
+    export C8Y_SESSION=$resp
 
     # Export session as individual settings
     # to support other 3rd party applicatsion (i.e. java c8y sdk apps)

diff --git a/tools/bash/c8y.profile.sh b/tools/bash/c8y.profile.sh
@@ -30,12 +30,11 @@ fi
 #   set-session
 #
 set-session () {
-    args=""
     if [ $# -gt 0 ]; then
-        args="--sessionFilter \"$@\""
+        resp=$( c8y sessions list --sessionFilter "$1 $2 $3 $4 $5" )
+    else
+        resp=$( c8y sessions list )
     fi
-    echo "c8y sessions list $args"
-    resp=$( c8y sessions list $args)
 
     if [ $? -ne 0 ]; then
         echo "Set session aborted"