fixed regression in map_server_error

remyla · Nov 17, 2020 · e42a426 · e42a426
1 parent 478f9dd
commit e42a426
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/cli/damas.sh b/cli/damas.sh
@@ -75,10 +75,11 @@ run() {
     echo "$1"
   fi
   RES=$(eval "$1")
-  err=$(map_server_errors "${RES##*$'\n'}")
-  if [ "0" != "$err" ]; then
+  map_server_errors "${RES##*$'\n'}"
+  err=$?
+  if [ 0 != $err ]; then
       echo "$RES" | sed '$d' | grep -v "^$" >&2
-	  return $err
+	  exit $err
   fi
   if [ ! $QUIET ]; then
     if [ $LINESOUT ]; then
@@ -275,7 +276,8 @@ case $COMMAND in
     echo $TOKEN
     echo $TOKEN > $TOKEN_FILE
     chmod go-rw "$TOKEN_FILE"
-    return $(map_server_errors "${RES##*$'\n'}")
+    map_server_errors "${RES##*$'\n'}"
+	exit $?
     ;;
   signout)
     TOKEN_FILE="/tmp/damas-$USER-$(echo -n $DAMAS_SERVER | cksum | head -c 10)"