From 94b6dcaa269004c39116d6db1bc3d918790e13e6 Mon Sep 17 00:00:00 2001 From: Ivan X Date: Sun, 17 Jan 2016 12:23:24 -0500 Subject: [PATCH] fixed a2server-setup and -update aliases not respecting env vars using new installer -i flag in a2server-update to trigger reinstall --- scripts/tools/a2server-aliases.txt | 6 +++--- update/index.txt | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/scripts/tools/a2server-aliases.txt b/scripts/tools/a2server-aliases.txt index f25605e..a06b503 100755 --- a/scripts/tools/a2server-aliases.txt +++ b/scripts/tools/a2server-aliases.txt @@ -2,17 +2,17 @@ # vim: set tabstop=4 shiftwidth=4 expandtab filetype=sh: alias a2server-help="more /usr/local/etc/a2server-help.txt" -alias a2server-setup="wget -q -O /tmp/a2server-setup ${A2SERVER_SCRIPT_URL:-https://rawgit.com/RasppleII/a2server/current}/setup/index.txt || { echo \"Can't download A2SERVER setup scripts. Do you has internet?\"; false; } && source /tmp/a2server-setup" +alias a2server-setup='wget -q -O /tmp/a2server-setup ${A2SERVER_SCRIPT_URL:-https://rawgit.com/RasppleII/a2server/current/}setup/index.txt || { echo "Can'"'"'t download A2SERVER setup scripts. Do you has internet?"; false; } && source /tmp/a2server-setup' alias a2server-version="cat /usr/local/etc/A2SERVER-version" -alias a2server-update="wget -q -O /tmp/a2server-update ${A2SERVER_SCRIPT_URL:-https://rawgit.com/RasppleII/a2server/current}/update/index.txt || { echo \"Can't download A2SERVER setup scripts. Do you has internet?\"; false; } && source /tmp/a2server-update" +alias a2server-update='wget -q -O /tmp/a2server-update ${A2SERVER_SCRIPT_URL:-https://rawgit.com/RasppleII/a2server/current/}update/index.txt || { echo "Can'"'"'t download A2SERVER setup scripts. Do you has internet?"; false; } && source /tmp/a2server-update' alias system-shutdown='sudo shutdown -h now' 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}scripts/raspbian-update.txt; source /tmp/raspbian-update' +alias raspbian-update='wget -qO /tmp/raspbian-update ${A2SERVER_SCRIPT_URL:-https://rawgit.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/update/index.txt b/update/index.txt index b2df15c..605da93 100755 --- a/update/index.txt +++ b/update/index.txt @@ -37,9 +37,8 @@ else read fi if [[ ${REPLY:0:1} == "y" || ${REPLY:0:1} == "Y" ]]; then - sudo rm /usr/local/etc/A2SERVER-version &> /dev/null # sudo rm /usr/local/etc/netatalk/a2boot/* &> /dev/null - wget -q -O /tmp/setup "${scriptURL}setup/index.txt"; source /tmp/setup "$@" + wget -q -O /tmp/setup "${scriptURL}setup/index.txt"; source /tmp/setup -i "$@" fi unset currentVersion 2> /dev/null