From 44d7237d6ba7fdfcaa368f211c2950eefb84aa60 Mon Sep 17 00:00:00 2001 From: Guard13007 Date: Thu, 20 Nov 2014 13:12:35 -0800 Subject: [PATCH] more stuffs changed --- build | 17 +++++++++-------- config.sh | 6 +++--- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/build b/build index 590c591..8ab6cc6 100644 --- a/build +++ b/build @@ -31,30 +31,33 @@ if [ ! -r "$win32Dir/love-0.9.1-win32/love.exe" ]; then mkdir -p "$win32Dir" echo "Downloading win32src..." $download "$win32Dir/love32.zip" https://bitbucket.org/rude/love/downloads/love-0.9.1-win32.zip - echo " Extracting win32src..." + echo " Done." + echo "Extracting win32src..." unzip -q "$win32Dir/love32.zip" -d "$win32Dir" - echo " Done." + echo " Done." fi if [ ! -r "$win64Dir/love-0.9.1-win64/love.exe" ]; then mkdir -p "$win64Dir" echo "Downloading win64src..." $download "$win64Dir/love64.zip" https://bitbucket.org/rude/love/downloads/love-0.9.1-win64.zip - echo " Extracting win64src..." + echo " Done." + echo "Extracting win64src..." unzip -q "$win64Dir/love64.zip" -d "$win64Dir" - echo " Done." + echo " Done." fi if [ ! -d "$osx10Dir/love.app" ]; then mkdir -p "$osx10Dir" echo "Downloading osx10src..." $download "$osx10Dir/loveOSX.zip" https://bitbucket.org/rude/love/downloads/love-0.9.1-macosx-x64.zip - echo " Extracting osx10src..." + echo " Done." + echo "Extracting osx10src..." unzip -q "$osx10Dir/loveOSX.zip" -d "$osx10Dir" # delete Mac crao (for some reason can't not unzip it *shrugs*) rm -rf "$osx10Dir/__MACOSX" # the Info.plist is overwritten each time the app is built, so it is not fixed here. - echo " Done." + echo " Done." fi # build executables and zip files for them @@ -105,7 +108,6 @@ else echo " See README.md for information." fi -echo echo "Building $packageName (version $version)... (Linux zip)" cd "$outputDir" zip -r -X -q "./$packageName-${version}_linux.zip" "./$packageName-$version.love" @@ -115,5 +117,4 @@ cd "$includes" zip -r -X -q "$outputDir/$packageName-${version}_linux.zip" ./* echo " Done." -echo echo "Builds complete. Unless there are errors above. Double check your files." diff --git a/config.sh b/config.sh index 62f5ce5..d867316 100644 --- a/config.sh +++ b/config.sh @@ -30,9 +30,9 @@ allowOverwrite=false autoNumberBuilds=false # Use curl or wget? -# Comment out the first and uncomment the second to use wget instead of curl. -download="curl -o" -#download="wget --progress=bar:force -O" +# Comment out one and..not the other... +#download="curl -o" +download="wget --progress=bar:force -O" # Only change this if you know what you're doing (Read the README.md file). macInfoPlistFixed=false