From d05fb987b54e8c71df61b20d9bb41ce3ac896e0f Mon Sep 17 00:00:00 2001 From: Paul Liverman III Date: Sun, 13 Dec 2015 18:46:03 -0800 Subject: [PATCH] wtf did I do wrong? --- build | 20 ++++++++++---------- build-config.sh | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/build b/build index 9a649a5..bd6dc35 100644 --- a/build +++ b/build @@ -29,7 +29,7 @@ if [ $autoNumberBuilds = true ]; then # store the current build number echo "build=$build" > "$outputDir/build.number" # set version to use new build number - version=$version-build$build + version=$version-$build fi # check that zip and unzip are accessible @@ -93,7 +93,7 @@ if [ ! -d "$osx10Dir/love.app" ]; then echo " Done." echo "Extracting osx10src..." unzip -q "$osx10Dir/loveOSX.zip" -d "$osx10Dir" - # delete Mac crao (for some reason can't not unzip it *shrugs*) + # delete Mac crap (for some reason can't not unzip it *shrugs*) rm -rf "$osx10Dir/__MACOSX" # the Info.plist is generated each time a package is built, we don't need a copy here rm -f "$osx10Dir/love.app/Contents/Info.plist" @@ -118,8 +118,8 @@ cp ./license.txt ./LOVE-license.txt # ZIP up the LOVE license zip -r -X -q "$outputDir/$packageName-${version}_win32.zip" ./LOVE-license.txt # ZIP up extra included files -if [ "$(ls -A $build-includes)" ]; then - cd "$build-includes" +if [ "$(ls -A $includes)" ]; then + cd "$includes" zip -r -X -q "$outputDir/$packageName-${version}_win32.zip" ./* fi echo " Done." @@ -137,8 +137,8 @@ cp ./license.txt ./LOVE-license.txt # ZIP up the LOVE license zip -r -X -q "$outputDir/$packageName-${version}_win64.zip" ./LOVE-license.txt # ZIP up extra included files -if [ "$(ls -A $build-includes)" ]; then - cd "$build-includes" +if [ "$(ls -A $includes)" ]; then + cd "$includes" zip -r -X -q "$outputDir/$packageName-${version}_win64.zip" ./* fi echo " Done." @@ -161,8 +161,8 @@ rm -rf "$originalDir/tmp" # ZIP up the .app directory zip -r -X -q "$outputDir/$packageName-${version}_osx.zip" "./$packageName.app" # ZIP up the extra included files -if [ "$(ls -A $build-includes)" ]; then - cd "$build-includes" +if [ "$(ls -A $includes)" ]; then + cd "$includes" zip -r -X -q "$outputDir/$packageName-${version}_osx.zip" ./* fi echo " Done." @@ -175,8 +175,8 @@ cp "$win64Dir/love-$loveVersion-win64/LOVE-license.txt" ./LOVE-license.txt # ZIP up the LOVE license zip -r -X -q "./$packageName-${version}_linux.zip" ./LOVE-license.txt # ZIP up the extra included files -if [ "$(ls -A $build-includes)" ]; then - cd "$build-includes" +if [ "$(ls -A $includes)" ]; then + cd "$includes" zip -r -X -q "$outputDir/$packageName-${version}_linux.zip" ./* fi echo " Done." diff --git a/build-config.sh b/build-config.sh index 252d9fd..285ace9 100644 --- a/build-config.sh +++ b/build-config.sh @@ -18,7 +18,7 @@ outputDir="$(pwd)/builds" # Where the source code is. (This should be where your main.lua file is.) sourceDir="$(pwd)/src" # Files to include in ZIP packages. (ReadMe's, licenses, etc.) -includes="$(pwd)/includes" +includes="$(pwd)/build-includes" # Where unzipped executables to make packages out of will be kept # (This is also where LOVE executables will be kept before modifications to make your packages)