From ec1ab1b0d55a21b223485b27bbc6fa6610f1875a Mon Sep 17 00:00:00 2001
From: makefu <root@pigstarter.de>
Date: Tue, 17 Dec 2013 17:53:31 +0100
Subject: punani ui is in lib/punani again

---
 ship/lib/core | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'ship/lib/core')

diff --git a/ship/lib/core b/ship/lib/core
index d6e01352..6ae87fa4 100644
--- a/ship/lib/core
+++ b/ship/lib/core
@@ -22,12 +22,11 @@ defer(){
 }
 
 esudo(){
-  # becomes root with sudo powers
-  # unless nosudo env is set
-  if test "${nosudo-false}" != true && ! is_root; then
-    echo "we're going sudo..." >&2
-    exec sudo -E "$0" "$@"
-    exit 23 # go to hell
+  # weaksauce esudo, bail out if we are not root
+  if ! is_root; then
+    # for the records:
+    #    exec sudo -E "$0" "$@"
+    die "You are not root enough to run this script" 2>&1
   fi
 }
 
-- 
cgit v1.2.3


From afb34a1551c3bfb0bdc15d7059de8c47f31b6700 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 17 Dec 2013 19:34:28 +0100
Subject: esudo is now weaksauce

---
 ship/lib/core | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'ship/lib/core')

diff --git a/ship/lib/core b/ship/lib/core
index 6ae87fa4..d6e01352 100644
--- a/ship/lib/core
+++ b/ship/lib/core
@@ -22,11 +22,12 @@ defer(){
 }
 
 esudo(){
-  # weaksauce esudo, bail out if we are not root
-  if ! is_root; then
-    # for the records:
-    #    exec sudo -E "$0" "$@"
-    die "You are not root enough to run this script" 2>&1
+  # becomes root with sudo powers
+  # unless nosudo env is set
+  if test "${nosudo-false}" != true && ! is_root; then
+    echo "we're going sudo..." >&2
+    exec sudo -E "$0" "$@"
+    exit 23 # go to hell
   fi
 }
 
-- 
cgit v1.2.3


From 80225e662c571e03559199006d85e7e4c696fd64 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 17 Dec 2013 19:52:38 +0100
Subject: re-add core/esudo as weaksauce version

---
 ship/lib/core | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'ship/lib/core')

diff --git a/ship/lib/core b/ship/lib/core
index d6e01352..7e8ac1ef 100644
--- a/ship/lib/core
+++ b/ship/lib/core
@@ -22,11 +22,11 @@ defer(){
 }
 
 esudo(){
-  # becomes root with sudo powers
-  # unless nosudo env is set
-  if test "${nosudo-false}" != true && ! is_root; then
-    echo "we're going sudo..." >&2
-    exec sudo -E "$0" "$@"
+  # weaksauce esudo (expect sudo)
+  if ! is_root; then
+    # for the record:
+    # exec sudo -E "$0" "$@"
+    error "You are not root enough for this script"
     exit 23 # go to hell
   fi
 }
-- 
cgit v1.2.3