From b3b17a383877d71d5816c1d77b81bc7f67d2ac22 Mon Sep 17 00:00:00 2001 From: Alexander Griffith Date: Tue, 29 Sep 2020 15:25:52 -0400 Subject: [PATCH] Now downloads love from github rather than bitbucke --- appimage/build.sh | 18 ++++++++++++++---- love-release.sh | 8 ++++---- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/appimage/build.sh b/appimage/build.sh index a030c5c..6515272 100755 --- a/appimage/build.sh +++ b/appimage/build.sh @@ -13,11 +13,21 @@ fi VERSION="$1" LOVEFILE="$2" -LOVE_TAR_URL=https://bitbucket.org/rude/love/downloads/love-${VERSION}-linux-${ARCH}.tar.gz -LOVE_TAR=${HOME}/.cache/love-release/love/love-${VERSION}-${ARCH}.tar.gz +LOVE_TAR_URL=https://github.com/love2d/love/releases/download/${VERSION}/love-${VERSION}-linux-${ARCH}.tar.gz +CACHE_DIR=${HOME}/.cache/love-release/love +LOVE_TAR=$CACHE_DIR/love-${VERSION}-${ARCH}.tar.gz + +if ! test -d ${CACHE_DIR}; then + mkdir ${CACHE_DIR} +fi + if ! test -f ${LOVE_TAR}; then - echo "No tarball found for $VERSION in $LOVE_TAR" - exit 1 + curl -L -C - -o ${LOVE_TAR} ${LOVE_TAR_URL} +fi + +if ! test -f ${LOVE_TAR}; then + echo "No tarball found for $VERSION in $LOVE_TAR" + exit 1 fi download_if_needed() { diff --git a/love-release.sh b/love-release.sh index bd7cc8d..575f219 100755 --- a/love-release.sh +++ b/love-release.sh @@ -756,7 +756,7 @@ cd "$RELEASE_DIR" ## MacOS ## if [[ ! -f "$CACHE_DIR/love-$LOVE_VERSION-macos.zip" ]]; then - curl -L -C - -o $CACHE_DIR/love-$LOVE_VERSION-macos.zip https://bitbucket.org/rude/love/downloads/love-$LOVE_VERSION-macos.zip + curl -L -C - -o $CACHE_DIR/love-$LOVE_VERSION-macos.zip https://github.com/love2d/love/releases/download/$LOVE_VERSION/love-$LOVE_VERSION-macos.zip fi unzip -qq "$CACHE_DIR/love-$LOVE_VERSION-macos.zip" @@ -964,7 +964,7 @@ cd "$RELEASE_DIR" if [[ $X32 == true ]]; then if [[ ! -f "$CACHE_DIR/love-$LOVE_VERSION-win32.zip" ]]; then - curl -L -C - -o "$CACHE_DIR/love-$LOVE_VERSION-win32.zip" "https://bitbucket.org/rude/love/downloads/love-$LOVE_VERSION-win32.zip" + curl -L -C - -o "$CACHE_DIR/love-$LOVE_VERSION-win32.zip" "https://github.com/love2d/love/releases/download/$LOVE_VERSION/love-$LOVE_VERSION-win32.zip" fi unzip -qq "$CACHE_DIR/love-$LOVE_VERSION-win32.zip" @@ -995,9 +995,9 @@ if [[ $X64 == true ]] && compare_version "$LOVE_VERSION" '>=' '0.8.0'; then if [[ ! -f "$CACHE_DIR/love-$LOVE_VERSION-win64.zip" ]]; then if compare_version "$LOVE_VERSION" '>=' '0.9.0'; then - curl -L -C - -o "$CACHE_DIR/love-$LOVE_VERSION-win64.zip" "https://bitbucket.org/rude/love/downloads/love-$LOVE_VERSION-win64.zip" + curl -L -C - -o "$CACHE_DIR/love-$LOVE_VERSION-win64.zip" "https://github.com/love2d/love/releases/download/$LOVE_VERSION/love-$LOVE_VERSION-win64.zip" else - curl -L -C - -o "$CACHE_DIR/love-$LOVE_VERSION-win-x64.zip" "https://bitbucket.org/rude/love/downloads/love-$LOVE_VERSION-win-x64.zip" + curl -L -C - -o "$CACHE_DIR/love-$LOVE_VERSION-win-x64.zip" "https://github.com/love2d/love/releases/download/$LOVE_VERSION/love-$LOVE_VERSION-win64.zip" fi fi