Merge branch 'fix-apt_add' into 'main'

Fix apt_add fails on apt-key not found even if it is present See merge request xebis/shellib!25
old-xebis · Jan 8, 2022 · 1405fb2 · 1405fb2
2 parents bc570c2 + a1fcfa2
commit 1405fb2
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 4 deletions.
diff --git a/src/packages.sh b/src/packages.sh
@@ -72,7 +72,7 @@ function apt_add() {
         return "$status_err"
     fi
 
-    if ! apt-add-repository -h &>/dev/null || ! apt-key -h &>/dev/null; then
+    if ! apt-add-repository -h &>/dev/null || [ "$(apt-key -h)" == '' ]; then
         err 'apt-add-repository or apt-key not found'
         return "$status_err"
     fi

diff --git a/tests/packages.sh.bats b/tests/packages.sh.bats
@@ -229,6 +229,7 @@ setup() {
 
     function apt-key() {
         echo 'Help'
+        return 1
     }
     export -f apt-key
 
@@ -253,7 +254,10 @@ setup() {
 
     function apt-key() {
         case "$1" in
-        -h) echo 'Help' ;;
+        -h)
+            echo 'Help'
+            return 1
+            ;;
         add)
             echo "No key at '$2'"
             return 1
@@ -293,7 +297,15 @@ setup() {
     export -f apt-add-repository
 
     function apt-key() {
-        echo
+        case "$1" in
+        -h)
+            echo 'Help'
+            return 1
+            ;;
+        add)
+            echo
+            ;;
+        esac
     }
     export -f apt-key
 
@@ -322,7 +334,15 @@ setup() {
     export -f apt-add-repository
 
     function apt-key() {
-        echo
+        case "$1" in
+        -h)
+            echo 'Help'
+            return 1
+            ;;
+        add)
+            echo
+            ;;
+        esac
     }
     export -f apt-key