From 62be5c21f9fa17f7452acf8064800911faae051d Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 9 Dec 2013 22:17:22 +0100
Subject: make http_head both look similar when using either wget or curl

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

(limited to 'ship')

diff --git a/ship/lib/network b/ship/lib/network
index 29eefdbe..90d7ec4f 100644
--- a/ship/lib/network
+++ b/ship/lib/network
@@ -10,7 +10,7 @@ which_get_loader(){
       echo "wget -O-"
     fi
   else
-    echo "curl"
+    echo "curl -s"
   fi
   return 0
 }
@@ -21,19 +21,19 @@ which_head_loader(){
       warn "Please install curl or wget"
       return 1
     else
-      echo "wget -O- --spider"
+      echo "wget -O- --spider -S -q"
     fi
   else
-    echo "curl -I"
+    echo "curl -I -s"
   fi
   return 0
 }
 
 http_get(){
-    eval "$(which_get_loader)" "${1?please provide url}"
+    eval "$(which_get_loader)" "${1?please provide url}" 2>&1
 }
 http_head(){
-    eval "$(which_head_loader)" "${1?please provide url}"
+    eval "$(which_head_loader)" "${1?please provide url}" 2>&1
 }
 
 which_telnet(){
-- 
cgit v1.2.3


From 893c529590c68c0d0c1fdd1e39f442023f434404 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 11 Dec 2013 00:55:30 +0100
Subject: add @strict macro, fix @info for code not under version control
 (private code)

---
 ship/build | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'ship')

diff --git a/ship/build b/ship/build
index 5863e325..2051a7db 100755
--- a/ship/build
+++ b/ship/build
@@ -40,12 +40,22 @@ EOF
   fi
 }
 
+## usage: #@strict -> build_strict_mode \1
+build_strict_mode() { cat<<EOF
+$1a\\
+set -euf\\
+set -o posix || true
+EOF
+}
+
 ## usage: #@info -> build_info \1
-build_info() { cat<<EOF
+build_info() { 
+    gitinfo=$(git describe --always --dirty --abbrev=0 2>/dev/null || true)
+cat<<EOF
 $1a\\
 # this file was generated by //ship/build\\
 #   build date: $(date -u --rfc-3339=s)\\
-#   git describe: $(git describe --always --dirty --abbrev=0)
+#   git describe: ${gitinfo:-not under version control}
 EOF
 }
 
@@ -177,6 +187,8 @@ buildcache_add() {
   echo "$1" >> "$buildcache"
 }
 
+
+
 ###
 ### main invocation
 ###
-- 
cgit v1.2.3


From 9c5150a71affdd436a524f4f96c2c001f18ef09f Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 11 Dec 2013 01:17:30 +0100
Subject: build - because : is the new true

---
 ship/build | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'ship')

diff --git a/ship/build b/ship/build
index 2051a7db..f7dcf3c2 100755
--- a/ship/build
+++ b/ship/build
@@ -44,13 +44,13 @@ EOF
 build_strict_mode() { cat<<EOF
 $1a\\
 set -euf\\
-set -o posix || true
+set -o posix || :
 EOF
 }
 
 ## usage: #@info -> build_info \1
-build_info() { 
-    gitinfo=$(git describe --always --dirty --abbrev=0 2>/dev/null || true)
+build_info() {
+    gitinfo=$(git describe --always --dirty --abbrev=0 2>/dev/null || :)
 cat<<EOF
 $1a\\
 # this file was generated by //ship/build\\
-- 
cgit v1.2.3