From 5d253ae8e4b712c95ff2b7c33457dad263928de0 Mon Sep 17 00:00:00 2001
From: Lassulus <lassulus@googlemail.com>
Date: Wed, 12 Dec 2012 03:54:15 +0100
Subject: fixing for android

---
 retiolum/scripts/tinc_setup/new_install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'retiolum/scripts/tinc_setup/new_install.sh')

diff --git a/retiolum/scripts/tinc_setup/new_install.sh b/retiolum/scripts/tinc_setup/new_install.sh
index 1885d681..aea97e90 100755
--- a/retiolum/scripts/tinc_setup/new_install.sh
+++ b/retiolum/scripts/tinc_setup/new_install.sh
@@ -162,7 +162,7 @@ else
     LOADER=curl
 fi
 
-if ! $(/bin/ping -c 1 euer.krebsco.de -W 5 &>/dev/null) ;then
+if ! $(ping -c 1 euer.krebsco.de -W 5 1>/dev/null) ;then
     echo "Cant reach euer, check if your internet is working"
     exit 1
 fi
-- 
cgit v1.2.3


From dcac6e109c6b8ec56c5106d11dad052b9ce34aca Mon Sep 17 00:00:00 2001
From: Lassulus <lassulus@googlemail.com>
Date: Wed, 12 Dec 2012 03:57:03 +0100
Subject: fixed find_os not executing

---
 retiolum/scripts/tinc_setup/new_install.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'retiolum/scripts/tinc_setup/new_install.sh')

diff --git a/retiolum/scripts/tinc_setup/new_install.sh b/retiolum/scripts/tinc_setup/new_install.sh
index aea97e90..1f750fca 100755
--- a/retiolum/scripts/tinc_setup/new_install.sh
+++ b/retiolum/scripts/tinc_setup/new_install.sh
@@ -228,6 +228,12 @@ do
     esac
 done
 
+#check for OS
+if [ $OS -eq 0 ]; then
+    echo $OS
+    find_os
+fi
+
 #check if everything is installed
 if [ $OS -eq 2 ]; then
     if ! test -e /data/data/org.poirsouille.tinc_gui/files/tincd; then
@@ -294,11 +300,6 @@ done
 #check for free hostname
 get_hostname $HOSTN
 
-#check for OS
-if [ $OS -eq 0 ]; then
-    echo $OS
-    find_os
-fi
 
 #create the configs
 mkdir -p /etc/tinc/$NETNAME
-- 
cgit v1.2.3


From 3e14311b99f0cb6a304314fae02dab8a0bfb9eb6 Mon Sep 17 00:00:00 2001
From: Lassulus <lassulus@googlemail.com>
Date: Wed, 12 Dec 2012 04:05:01 +0100
Subject: added #!/bin/sh

---
 retiolum/scripts/tinc_setup/new_install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'retiolum/scripts/tinc_setup/new_install.sh')

diff --git a/retiolum/scripts/tinc_setup/new_install.sh b/retiolum/scripts/tinc_setup/new_install.sh
index 1f750fca..c6a572d2 100755
--- a/retiolum/scripts/tinc_setup/new_install.sh
+++ b/retiolum/scripts/tinc_setup/new_install.sh
@@ -1,4 +1,4 @@
-
+#!/bin/sh
 
 #get sudo
 if test "${nosudo-false}" != true -a `id -u` != 0; then
-- 
cgit v1.2.3