From 2d7276a789a9ce2062c351afd27e33021c1ce5b1 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 30 Dec 2013 17:36:55 +0100
Subject: ship/punani: fix TODOs regarding return values

---
 ship/lib/punani | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'ship/lib/punani')

diff --git a/ship/lib/punani b/ship/lib/punani
index ea05a4ec..512c732c 100644
--- a/ship/lib/punani
+++ b/ship/lib/punani
@@ -70,14 +70,14 @@ punani(){
         if punani_has $RES; then
           info "$RES already installed, skipping"
         else
-          punani_install $RES || error "cannot install $RES with $PACKER"
+          punani_install $RES || die "cannot install $RES with $PACKER"
         fi
         ;;
       remove)
         if ! punani_has $RES; then
           info "$RES not installed, skipping"
         else
-          punani_remove $RES || error "cannot install $RES with $PACKER"
+          punani_remove $RES || die "cannot install $RES with $PACKER"
         fi
         ;;
       has)
@@ -85,6 +85,7 @@ punani(){
           info "$RES is installed"
         else
           info "$RES is not installed"
+          exit 1
         fi
         ;;
       owner)
-- 
cgit v1.2.3


From efef353ef2bf65ef6123fc699bce6c69fc37cfcc Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 30 Dec 2013 17:37:55 +0100
Subject: fix punani bug regarding pacman package removal

---
 ship/lib/punani | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ship/lib/punani')

diff --git a/ship/lib/punani b/ship/lib/punani
index 512c732c..4338d19d 100644
--- a/ship/lib/punani
+++ b/ship/lib/punani
@@ -34,7 +34,7 @@ _punani_select_packer() {
 }
 _punani_known_packers='pacman apt-get yum brew'
 _punani_pacman_install(){ pacman --noconfirm -S --needed "$@" ;}
-_punani_pacman_remove(){ pacman -Rcs "$@" ;}
+_punani_pacman_remove(){ pacman --noconfirm -Rcs "$@" ;}
 _punani_pacman_has(){ pacman -Q "$1" >/dev/null;}
 _punani_pacman_owner() { pacman -Qo "$1"; }
 _punani_aptget_install(){ apt-get -y install "$@" ;}
-- 
cgit v1.2.3