From 60f88e4e8a1ad9a57e4111275e8aa4054365521e Mon Sep 17 00:00:00 2001 From: Ivan X Date: Sat, 16 Jan 2016 23:47:03 -0500 Subject: [PATCH] use rawgit.com for default A2SERVER_SCRIPT_URL --- scripts/a2server-2-tools.txt | 2 +- scripts/a2server-3-sharing.txt | 2 +- scripts/a2server-5-netboot.txt | 2 +- scripts/tools/a2server-aliases.txt | 4 ++-- scripts/tools/a2serverrc.txt | 2 +- setup/index.txt | 6 +++--- update/index.txt | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/scripts/a2server-2-tools.txt b/scripts/a2server-2-tools.txt index 1463072..b0c6316 100755 --- a/scripts/a2server-2-tools.txt +++ b/scripts/a2server-2-tools.txt @@ -7,7 +7,7 @@ # Ensure URL we'll use ends in a / case "$A2SERVER_SCRIPT_URL" in */) scriptURL="$A2SERVER_SCRIPT_URL" ;; - *) scriptURL="${A2SERVER_SCRIPT_URL:-http://ivanx.com/a2server}/" ;; + *) scriptURL="${A2SERVER_SCRIPT_URL:-https://rawgit.com/RasppleII/a2server/current}/" ;; esac case "$A2SERVER_BINARY_URL" in */) binaryURL="$A2SERVER_BINARY_URL" ;; diff --git a/scripts/a2server-3-sharing.txt b/scripts/a2server-3-sharing.txt index e7f0ba3..321ab4b 100755 --- a/scripts/a2server-3-sharing.txt +++ b/scripts/a2server-3-sharing.txt @@ -17,7 +17,7 @@ # Ensure URL we'll use ends in a / case "$A2SERVER_SCRIPT_URL" in */) scriptURL="$A2SERVER_SCRIPT_URL" ;; - *) scriptURL="${A2SERVER_SCRIPT_URL:-http://appleii.ivanx.com/a2server}/" ;; + *) scriptURL="${A2SERVER_SCRIPT_URL:-https://rawgit.com/RasppleII/a2server/current}/" ;; esac case "$A2SERVER_BINARY_URL" in */) binaryURL="$A2SERVER_BINARY_URL" ;; diff --git a/scripts/a2server-5-netboot.txt b/scripts/a2server-5-netboot.txt index d941498..500dea2 100755 --- a/scripts/a2server-5-netboot.txt +++ b/scripts/a2server-5-netboot.txt @@ -10,7 +10,7 @@ # Ensure URL we'll use ends in a / case "$A2SERVER_SCRIPT_URL" in */) scriptURL="$A2SERVER_SCRIPT_URL" ;; - *) scriptURL="${A2SERVER_SCRIPT_URL:-http://ivanx.com/a2server}/" ;; + *) scriptURL="${A2SERVER_SCRIPT_URL:-https://rawgit.com/RasppleII/a2server/current}/" ;; esac case "$A2SERVER_BINARY_URL" in */) binaryURL="$A2SERVER_BINARY_URL" ;; diff --git a/scripts/tools/a2server-aliases.txt b/scripts/tools/a2server-aliases.txt index 83d5011..f25605e 100755 --- a/scripts/tools/a2server-aliases.txt +++ b/scripts/tools/a2server-aliases.txt @@ -2,10 +2,10 @@ # 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}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}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' diff --git a/scripts/tools/a2serverrc.txt b/scripts/tools/a2serverrc.txt index 4179b11..44bca25 100755 --- a/scripts/tools/a2serverrc.txt +++ b/scripts/tools/a2serverrc.txt @@ -1,6 +1,6 @@ #! /bin/bash # vim: set tabstop=4 shiftwidth=4 expandtab filetype=sh: -export A2SERVER_SCRIPT_URL="${A2SERVER_SCRIPT_URL:-http://ivanx.com/a2server/}" +export A2SERVER_SCRIPT_URL="${A2SERVER_SCRIPT_URL:-https://rawgit.com/RasppleII/a2server/current/}" export A2SERVER_BINARY_URL="${A2SERVER_BINARY_URL:-http://ivanx.com/a2server/files/}" source /usr/local/etc/a2server-aliases diff --git a/setup/index.txt b/setup/index.txt index c62dcae..c84d5b3 100755 --- a/setup/index.txt +++ b/setup/index.txt @@ -9,12 +9,12 @@ # to download and execute, type: # wget ivanx.com/a2server/setup; source setup -a2serverVersion="132" +a2serverVersion="133" # Ensure URL we'll use ends in a / case "$A2SERVER_SCRIPT_URL" in */) scriptURL="$A2SERVER_SCRIPT_URL" ;; - *) scriptURL="${A2SERVER_SCRIPT_URL:-http://ivanx.com/a2server}/" ;; + *) scriptURL="${A2SERVER_SCRIPT_URL:-https://rawgit.com/RasppleII/a2server/current}/" ;; esac case "$A2SERVER_BINARY_URL" in */) binaryURL="$A2SERVER_BINARY_URL" ;; @@ -35,7 +35,7 @@ if [[ -f /usr/local/etc/A2SERVER-version ]]; then fi echo -[[ $scriptURL != *"ivanx.com"* ]] && echo "Using script URL: $scriptURL" +[[ $scriptURL != *"ivanx.com"* && $scriptURL != *"rawgit.com"* ]] && echo "Using script URL: $scriptURL" [[ $binaryURL != *"ivanx.com"* ]] && echo "Using binary URL: $binaryURL" [[ ! $useExternalURL ]] && echo -e "Not using external URLs. Downloads must be available from:\n ${binaryURL}external/appleii/\n ${binaryURL}external/source/\n (See the A2SERVER developer page for more information.)" diff --git a/update/index.txt b/update/index.txt index f62580a..b2df15c 100755 --- a/update/index.txt +++ b/update/index.txt @@ -4,7 +4,7 @@ # Ensure URL we'll use ends in a / case "$A2SERVER_SCRIPT_URL" in */) scriptURL="$A2SERVER_SCRIPT_URL" ;; - *) scriptURL="${A2SERVER_SCRIPT_URL:-http://ivanx.com/a2server}/" ;; + *) scriptURL="${A2SERVER_SCRIPT_URL:-https://rawgit.com/RasppleII/a2server/current}/" ;; esac currentVersion=$(wget -qO- "${scriptURL}setup/index.txt" | grep '^a2serverVersion' | cut -d '"' -f 2)