From 95fc0ef629279d5d2096a2674c52f057ac0d3d1f Mon Sep 17 00:00:00 2001
From: "T. Joseph Carter" <tjcarter@spiritsubstance.com>
Date: Sun, 27 Nov 2016 03:03:03 -0800
Subject: [PATCH] Rename raspbian-update, make install script

It's understandable why you might want to pull this off a server in case
how you have to upgrade things changes for some reason, but we're moving
toward following Debian's lead on these things to the greatest extent
possible.
---
 scripts/a2server-2-tools.txt                           | 2 +-
 scripts/tools/a2server-aliases                         | 2 +-
 scripts/{raspbian-update.txt => tools/raspbian-update} | 0
 setup/index.txt                                        | 6 ++++--
 4 files changed, 6 insertions(+), 4 deletions(-)
 rename scripts/{raspbian-update.txt => tools/raspbian-update} (100%)
 mode change 100644 => 100755

diff --git a/scripts/a2server-2-tools.txt b/scripts/a2server-2-tools.txt
index 24f97b0..ae34920 100755
--- a/scripts/a2server-2-tools.txt
+++ b/scripts/a2server-2-tools.txt
@@ -182,7 +182,7 @@ else
 	echo "A2SERVER: unzip has already been installed."
 fi
 
-a2sTools="afpsync afptype mkatinit mkvolinfo cppo"
+a2sTools="afpsync afptype mkatinit mkvolinfo cppo raspbian-update"
 a2sHelp="a2server-help.txt"
 a2sConfScripts="a2server-aliases a2serverrc"
 if [[ -z "$a2sDevel" ]]; then
diff --git a/scripts/tools/a2server-aliases b/scripts/tools/a2server-aliases
index cdf984a..9b124e6 100755
--- a/scripts/tools/a2server-aliases
+++ b/scripts/tools/a2server-aliases
@@ -12,7 +12,7 @@ alias system-restart='sudo shutdown -r now'
 
 
 alias raspi-config='[[ -f /usr/bin/raspi-config ]] && sudo /usr/bin/raspi-config || echo "raspi-config not found. Are you using a Raspberry Pi with Raspbian?"'
-alias raspbian-update='wget -qO /tmp/raspbian-update ${A2SERVER_SCRIPT_URL:-https://raw.githubusercontent.com/RasppleII/a2server/current/}scripts/raspbian-update.txt || { echo "Can'"'"'t download A2SERVER setup scripts. Do you has internet?"; false; } && source /tmp/raspbian-update'
+
 alias rasppleii-update='raspbian-update a2cloud a2server'
 
 alias welcome-message-edit='sudo nano /etc/motd'
diff --git a/scripts/raspbian-update.txt b/scripts/tools/raspbian-update
old mode 100644
new mode 100755
similarity index 100%
rename from scripts/raspbian-update.txt
rename to scripts/tools/raspbian-update
diff --git a/setup/index.txt b/setup/index.txt
index bccf17c..cc050e1 100755
--- a/setup/index.txt
+++ b/setup/index.txt
@@ -184,8 +184,10 @@ done
 
 if [[ $updateRasppleII ]]; then
 	echo "A2SERVER: Updating Raspple II (takes up to an hour)..."
-	wget -qO /tmp/raspbian-update "${A2SERVER_SCRIPT_URL}scripts/raspbian-update.txt"
-	source /tmp/raspbian-update a2cloud a2server $autoAnswerYes $skipRepoUpdate
+	wget -qO /tmp/raspbian-update "${A2SERVER_SCRIPT_URL}scripts/tools/raspbian-update"
+	chmod +x /tmp/raspbian-update
+	/tmp/raspbian-update a2cloud a2server $autoAnswerYes $skipRepoUpdate
+	rm -f /tmp/raspbian-update
 	if [[ $0 == "-bash" ]]; then
 		return 0
 	else