Merge pull request #267 from stooj/master

Fix #266. Set curl to follow redirects
This commit is contained in:
Zach Latta 2014-08-19 19:47:02 -07:00
commit 1b0d3c2fbb
2 changed files with 2 additions and 2 deletions

View File

@ -1,5 +1,5 @@
UPDATE_URL="https://raw.github.com/marcuswhybrow/minecraft-server-manager/master" UPDATE_URL="https://raw.github.com/marcuswhybrow/minecraft-server-manager/master"
curl "${UPDATE_URL}/installers/common.sh" -o /tmp/msmcommon.sh #wget isn't installed on Arch by default curl -L "${UPDATE_URL}/installers/common.sh" -o /tmp/msmcommon.sh #wget isn't installed on Arch by default
source /tmp/msmcommon.sh && rm -f /tmp/msmcommon.sh source /tmp/msmcommon.sh && rm -f /tmp/msmcommon.sh
function update_system_packages() { function update_system_packages() {

View File

@ -16,7 +16,7 @@ function check_os() {
function get_installer() { function get_installer() {
type curl 1>/dev/null 2>&1 type curl 1>/dev/null 2>&1
if [[ $? -eq 0 ]]; then if [[ $? -eq 0 ]]; then
curl "${BASE_URL}/${INSTALL_SCRIPT}" -o /tmp/msminst.sh curl -L "${BASE_URL}/${INSTALL_SCRIPT}" -o /tmp/msminst.sh
else else
wget -q "${BASE_URL}/${INSTALL_SCRIPT}" -O /tmp/msminst.sh wget -q "${BASE_URL}/${INSTALL_SCRIPT}" -O /tmp/msminst.sh
fi fi