From 7d4dc890a530e1af62caec9f05f9d7331bcc678f Mon Sep 17 00:00:00 2001
From: Ole Tange <ole@tange.dk>
Date: Sat, 28 Sep 2013 18:53:37 +0200
Subject: [PATCH] 10seconds_install: If gpg missing: Read from </dev/tty.
 FreeBSD uses fetch.

---
 10seconds_install | 17 ++++++++++++++---
 README            |  2 +-
 src/parallel      |  2 +-
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/10seconds_install b/10seconds_install
index ab4ceeb5..0c2b1a16 100644
--- a/10seconds_install
+++ b/10seconds_install
@@ -14,12 +14,23 @@
 # If that fails, it does a personal installation.
 # If that fails, it copies to $HOME/bin
 
+# Download and run the script directly by:
+#   (wget -O - pi.dk/3 || curl pi.dk/3/ || fetch -o - http://pi.dk/3) | bash
+
 # tail on openindiana must be /usr/xpg4/bin/tail
 TAIL=$(echo | tail -n 1 2>/dev/null && echo tail || (echo | /usr/xpg4/bin/tail -n 1 && echo /usr/xpg4/bin/tail))
 # grep on openindiana must be /usr/xpg4/bin/grep
 GREP=$(echo | grep -vE . 2>/dev/null && echo grep || (echo | /usr/xpg4/bin/grep -vE . && echo /usr/xpg4/bin/grep))
-# wget is not default on MacOS, so try curl
-GET=$(curl -h >/dev/null && echo curl -L || echo wget -qO -)
+# FreeBSD prefers 'fetch', MacOS prefers 'curl', Linux prefers 'wget'
+GET=$(
+    (fetch -o /dev/null file:///bin/sh && echo fetch -o -) ||
+    (curl -h >/dev/null && echo curl -L) || 
+    (wget -h >/dev/null && echo wget -qO -) ||
+    echo 'No wget, curl, fetch: Please inform parallel@gnu.org what you use for downloading URLs' >&2
+)
+if test "$GET" = ""; then
+  exit 1
+fi
 
 LATEST=$($GET http://ftpmirror.gnu.org/parallel | perl -ne '/(parallel-\d{8})/ and print $1."\n"' | sort | $TAIL -n1)
 if test \! -d $LATEST/src/; then
@@ -54,7 +65,7 @@ else
   echo "This means that if the code has been changed by criminals, you will not discover that!"
   echo 
   echo "Continue anyway? (y/n)"
-  read YN
+  read YN </dev/tty
   if test "$YN" = "n"; then
 	# Stop
 	exit 2
diff --git a/README b/README
index 52cfaa0b..12d4c260 100644
--- a/README
+++ b/README
@@ -30,7 +30,7 @@ The 10 seconds installation will try do to a full installation; if
 that fails, a personal installation; if that fails, a minimal
 installation.
 
-  (wget -O - pi.dk/3 || curl pi.dk/3/) | bash
+  (wget -O - pi.dk/3 || curl pi.dk/3/ || fetch -o - http://pi.dk/3) | bash
 
 This will literally install faster than reading the rest of this
 document.
diff --git a/src/parallel b/src/parallel
index 7002cdff..66dd0da1 100755
--- a/src/parallel
+++ b/src/parallel
@@ -790,7 +790,7 @@ sub get_options_from_array {
 sub parse_options {
     # Returns: N/A
     # Defaults:
-    $Global::version = 20130922;
+    $Global::version = 20130927;
     $Global::progname = 'parallel';
     $Global::infinity = 2**31;
     $Global::debug = 0;