diff --git a/examples/pxScene2d/src/macstuff/spark.sh b/examples/pxScene2d/src/macstuff/spark.sh index bcf02d47dc..b82f7958bc 100755 --- a/examples/pxScene2d/src/macstuff/spark.sh +++ b/examples/pxScene2d/src/macstuff/spark.sh @@ -64,11 +64,11 @@ if [ -e ./version ] && [ -w . ]; then VERSION=`cat ./version` if [[ "$VERSION" != "edge"* ]]; then UPDATE_URL=http://www.sparkui.org/dist/osx/spark/software_update.plist - ./EngineRunner run -productid org.pxscene.pxscene -version $VERSION -url ${UPDATE_URL} & + ./sparkUpdater.sh -productid org.pxscene.pxscene -version $VERSION -url ${UPDATE_URL} else if [[ $updateEdge == "true" ]] || [[ $updateEdge == 1 ]] ; then UPDATE_URL=http://96.116.56.119/edge/osx/artifacts/software_update.plist - ./EngineRunner run -productid org.pxscene.pxscene -version $VERSION -url ${UPDATE_URL} & + ./sparkUpdater.sh -productid org.pxscene.pxscene -version $VERSION -url ${UPDATE_URL} fi fi else diff --git a/examples/pxScene2d/src/macstuff/sparkUpdater.sh b/examples/pxScene2d/src/macstuff/sparkUpdater.sh new file mode 100755 index 0000000000..079290c81a --- /dev/null +++ b/examples/pxScene2d/src/macstuff/sparkUpdater.sh @@ -0,0 +1,89 @@ +#!/usr/bin/env bash +#./sparkUpdater.sh -productid org.pxscene.pxscene -version $VERSION -url ${UPDATE_URL} +#Get absolute path to this script +THIS_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" + +cd "$THIS_DIR" + +PRODUCT_ID=$2 +VERSION=$4 +URL=$6 +CURRENT_VERSION=0 +CURRENT_PRODUCT_ID=0 +CURRENT_CODEBASE="" +#echo "GIVEN" $PRODUCT_ID $VERSION $URL + +SOFTWARE_UPDATE_PLIST=$URL +DATA=$(curl $SOFTWARE_UPDATE_PLIST) +#echo $DATA + +idx="" +regex='([A-za-z0-9.\:/]+)' +while read -r line; do + + if [[ $idx == "ProductID" ]]; then + CURRENT_PRODUCT_ID=$line + if [[ $CURRENT_PRODUCT_ID =~ $regex ]] + then + CURRENT_PRODUCT_ID=${BASH_REMATCH[1]} + fi + idx="" + fi + if [[ $line == "ProductID" ]]; then + idx=$line + fi + if [[ $idx == "Version" ]]; then + CURRENT_VERSION=$line + if [[ $CURRENT_VERSION =~ $regex ]] + then + CURRENT_VERSION=${BASH_REMATCH[1]} + fi + idx="" + fi + if [[ $line == "Version" ]]; then + idx=$line + fi + if [[ $idx == "Codebase" ]]; then + CURRENT_CODEBASE=$line + if [[ $CURRENT_CODEBASE =~ $regex ]] + then + CURRENT_CODEBASE=${BASH_REMATCH[1]} + fi + idx="" + fi + if [[ $line == "Codebase" ]]; then + idx=$line + fi + + + +done <<< "$DATA" + + +#echo "CURRENT" $CURRENT_PRODUCT_ID $CURRENT_VERSION $CURRENT_CODEBASE +if [[ $PRODUCT_ID == $CURRENT_PRODUCT_ID ]]; then + + if [[ $CURRENT_VERSION != $VERSION ]]; then + echo "Updating..." + hdiutil attach $CURRENT_CODEBASE + if [ $CURRENT_CODEBASE ?? 'SparkEdge.dmg' ]; then + if [ -d "/Applications/SparkEdge.app" ] + then + cp -av /Volumes/SparkEdge/* ./ + else + cp -av /Volumes/SparkEdge/* /Applications/ + fi + else + if [ -d "/Applications/Spark.app" ] + then + cp -av /Volumes/Spark/* ./ + else + cp -av /Volumes/Spark/* /Applications/ + fi + fi + + fi + +fi + +#echo "${BASH_SOURCE[0]}" diff --git a/examples/pxScene2d/src/mkapp.sh b/examples/pxScene2d/src/mkapp.sh index 10446726dd..6dadeba540 100755 --- a/examples/pxScene2d/src/mkapp.sh +++ b/examples/pxScene2d/src/mkapp.sh @@ -104,6 +104,8 @@ fi cp macstuff/spark.sh $bundleBin cp macstuff/EngineRunner $bundleBin +cp macstuff/sparkUpdater.sh $bundleBin + # Minify JS into Bundle... #