From b3f97f25f742ceb7cbe1f12677e6ee83832598f1 Mon Sep 17 00:00:00 2001
From: Ray Ozzie <ray@ozzie.net>
Date: Mon, 21 Mar 2016 14:56:23 -0700
Subject: [PATCH] asdf

---
 install.sh  |  6 ++++++
 install.sh~ | 39 ---------------------------------------
 2 files changed, 6 insertions(+), 39 deletions(-)

diff --git a/install.sh b/install.sh
index 7fd3781..95d166e 100755
--- a/install.sh
+++ b/install.sh
@@ -81,6 +81,12 @@ if [ -f ./bin/poly_pkt_fwd ]; then rm ./bin/poly_pkt_fwd; fi
 ln -s $INSTALL_DIR/packet_forwarder/poly_pkt_fwd/poly_pkt_fwd ./bin/poly_pkt_fwd
 cp -f ./packet_forwarder/poly_pkt_fwd/global_conf.json ./bin/global_conf.json
 
+# Startup shell script
+
+cp ./start.sh ./bin/start.sh
+
+# Restore location
+
 popd
 
 echo "Installation completed."
diff --git a/install.sh~ b/install.sh~
index f8c031a..7fd3781 100755
--- a/install.sh~
+++ b/install.sh~
@@ -14,43 +14,6 @@ if [[ $1 != "" ]]; then VERSION=$1; fi
 echo "The Things Network Gateway installer"
 echo ""
 
-# Retrieve gateway configuration for later
-env
-
-echo "Configuring gateway:"
-
-if [[ $GATEWAY_NAME == "" ]]; then
-    echo "ERROR: NO GATEWAY_NAME FOUND IN ENVIRONMENT"
-    exit 1
-fi
-echo GATEWAY_NAME: $GATEWAY_NAME
-
-if [[ $GATEWAY_EMAIL == "" ]]; then
-    echo "ERROR: NO GATEWAY_EMAIL FOUND IN ENVIRONMENT"
-    exit 1
-fi
-echo GATEWAY_EMAIL: $GATEWAY_EMAIL
-
-if [[ $GATEWAY_LAT == "" ]]; then
-    echo "ERROR: NO GATEWAY_LAT (latitude) FOUND IN ENVIRONMENT"
-    exit 1
-fi
-echo GATEWAY_LAT: $GATEWAY_LAT
-
-if [[ $GATEWAY_LON == "" ]]; then
-    echo "ERROR: NO GATEWAY_LON (longitude) FOUND IN ENVIRONMENT"
-    exit 1
-fi
-echo GATEWAY_LON: $GATEWAY_LON
-
-if [[ $GATEWAY_ALT == "" ]]; then
-    echo "ERROR: NO GATEWAY_ALT (altitude) FOUND IN ENVIRONMENT"
-    exit 1
-fi
-echo GATEWAY_ALT: $GATEWAY_ALT
-
-echo ""
-
 # Check dependencies
 echo "Installing dependencies..."
 apt-get update
@@ -118,8 +81,6 @@ if [ -f ./bin/poly_pkt_fwd ]; then rm ./bin/poly_pkt_fwd; fi
 ln -s $INSTALL_DIR/packet_forwarder/poly_pkt_fwd/poly_pkt_fwd ./bin/poly_pkt_fwd
 cp -f ./packet_forwarder/poly_pkt_fwd/global_conf.json ./bin/global_conf.json
 
-echo -e "{\n\t\"gateway_conf\": {\n\t\t\"gateway_ID\": \"0000000000000000\",\n\t\t\"servers\": [ { \"server_address\": \"croft.thethings.girovito.nl\", \"serv_port_up\": 1700, \"serv_port_down\": 1701, \"serv_enabled\": true } ],\n\t\t\"ref_latitude\": $GATEWAY_LAT,\n\t\t\"ref_longitude\": $GATEWAY_LON,\n\t\t\"ref_altitude\": $GATEWAY_ALT,\n\t\t\"contact_email\": \"$GATEWAY_EMAIL\",\n\t\t\"description\": \"$GATEWAY_NAME\" \n\t}\n}" >./bin/local_conf.json
-
 popd
 
 echo "Installation completed."