From a637db2ffb3fc45ab6b142670de38775b50e813e Mon Sep 17 00:00:00 2001 From: ashkalokhe Date: Thu, 9 Jan 2020 09:26:16 -0500 Subject: [PATCH 01/12] Added spark updater --- .../pxScene2d/src/macstuff/sparkUpdater.sh | 75 +++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100755 examples/pxScene2d/src/macstuff/sparkUpdater.sh diff --git a/examples/pxScene2d/src/macstuff/sparkUpdater.sh b/examples/pxScene2d/src/macstuff/sparkUpdater.sh new file mode 100755 index 0000000000..be3b01c6c3 --- /dev/null +++ b/examples/pxScene2d/src/macstuff/sparkUpdater.sh @@ -0,0 +1,75 @@ +#!/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="./software_update.plist" +DATA=$(cat $SOFTWARE_UPDATE_PLIST) +#echo $DATA +#P_ID=$(cat $SOFTWARE_UPDATE_PLIST | grep ^ProductID:$tag1 | cut -d " " -f 2) +#echo "P_ID=$P_ID" + +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 "UPDATE" + sudo hdiutil attach $CURRENT_CODEBASE + fi + +fi + +#echo "${BASH_SOURCE[0]}" From b8db9a9d3e6a9ad30e1cd986785deb7009b9f8df Mon Sep 17 00:00:00 2001 From: ashkalokhe Date: Thu, 9 Jan 2020 09:28:04 -0500 Subject: [PATCH 02/12] update spark.sh to use sparkUpdater instead of EngineRunner --- examples/pxScene2d/src/macstuff/spark.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 From 66ffe8ef623ea8ba4fdc7dbcc50724001dae36e7 Mon Sep 17 00:00:00 2001 From: ashkalokhe Date: Thu, 9 Jan 2020 11:35:47 -0500 Subject: [PATCH 03/12] fixed url --- examples/pxScene2d/src/macstuff/sparkUpdater.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/pxScene2d/src/macstuff/sparkUpdater.sh b/examples/pxScene2d/src/macstuff/sparkUpdater.sh index be3b01c6c3..752a2044b2 100755 --- a/examples/pxScene2d/src/macstuff/sparkUpdater.sh +++ b/examples/pxScene2d/src/macstuff/sparkUpdater.sh @@ -67,7 +67,7 @@ if [[ $PRODUCT_ID == $CURRENT_PRODUCT_ID ]]; then if [[ $CURRENT_VERSION != $VERSION ]]; then echo "UPDATE" - sudo hdiutil attach $CURRENT_CODEBASE + sudo hdiutil attach $URL fi fi From 07a1795cb9ba238799d725140ff127f7ce3aaa5c Mon Sep 17 00:00:00 2001 From: ashkalokhe Date: Thu, 9 Jan 2020 14:31:46 -0500 Subject: [PATCH 04/12] cleanup --- examples/pxScene2d/src/macstuff/sparkUpdater.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/pxScene2d/src/macstuff/sparkUpdater.sh b/examples/pxScene2d/src/macstuff/sparkUpdater.sh index 752a2044b2..fcbf3cbae9 100755 --- a/examples/pxScene2d/src/macstuff/sparkUpdater.sh +++ b/examples/pxScene2d/src/macstuff/sparkUpdater.sh @@ -11,7 +11,7 @@ URL=$6 CURRENT_VERSION=0 CURRENT_PRODUCT_ID=0 CURRENT_CODEBASE="" -echo "GIVEN" $PRODUCT_ID $VERSION $URL +#echo "GIVEN" $PRODUCT_ID $VERSION $URL SOFTWARE_UPDATE_PLIST="./software_update.plist" DATA=$(cat $SOFTWARE_UPDATE_PLIST) @@ -62,7 +62,7 @@ while read -r line; do done <<< "$DATA" -echo "CURRENT" $CURRENT_PRODUCT_ID $CURRENT_VERSION $CURRENT_CODEBASE +#echo "CURRENT" $CURRENT_PRODUCT_ID $CURRENT_VERSION $CURRENT_CODEBASE if [[ $PRODUCT_ID == $CURRENT_PRODUCT_ID ]]; then if [[ $CURRENT_VERSION != $VERSION ]]; then From f77fa862b25b231dd0bd8824616734bc5f8e8760 Mon Sep 17 00:00:00 2001 From: ashkalokhe Date: Fri, 10 Jan 2020 13:45:24 -0500 Subject: [PATCH 05/12] downloading software_update.plist and installing spark --- examples/pxScene2d/src/macstuff/sparkUpdater.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/examples/pxScene2d/src/macstuff/sparkUpdater.sh b/examples/pxScene2d/src/macstuff/sparkUpdater.sh index fcbf3cbae9..6cf7d7e7e0 100755 --- a/examples/pxScene2d/src/macstuff/sparkUpdater.sh +++ b/examples/pxScene2d/src/macstuff/sparkUpdater.sh @@ -13,8 +13,8 @@ CURRENT_PRODUCT_ID=0 CURRENT_CODEBASE="" #echo "GIVEN" $PRODUCT_ID $VERSION $URL -SOFTWARE_UPDATE_PLIST="./software_update.plist" -DATA=$(cat $SOFTWARE_UPDATE_PLIST) +SOFTWARE_UPDATE_PLIST=$URL +DATA=$(curl $SOFTWARE_UPDATE_PLIST) #echo $DATA #P_ID=$(cat $SOFTWARE_UPDATE_PLIST | grep ^ProductID:$tag1 | cut -d " " -f 2) #echo "P_ID=$P_ID" @@ -66,8 +66,9 @@ done <<< "$DATA" if [[ $PRODUCT_ID == $CURRENT_PRODUCT_ID ]]; then if [[ $CURRENT_VERSION != $VERSION ]]; then - echo "UPDATE" - sudo hdiutil attach $URL + echo "Updating..." + hdiutil attach $CURRENT_CODEBASE + cp -av /Volumes/Spark/* /Applications/ fi fi From a6b7688c9b3107dafc977c0eeaaa7991f9ddf229 Mon Sep 17 00:00:00 2001 From: ashkalokhe Date: Fri, 10 Jan 2020 13:52:24 -0500 Subject: [PATCH 06/12] cleanup --- examples/pxScene2d/src/macstuff/sparkUpdater.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/examples/pxScene2d/src/macstuff/sparkUpdater.sh b/examples/pxScene2d/src/macstuff/sparkUpdater.sh index 6cf7d7e7e0..675e8489e2 100755 --- a/examples/pxScene2d/src/macstuff/sparkUpdater.sh +++ b/examples/pxScene2d/src/macstuff/sparkUpdater.sh @@ -16,8 +16,6 @@ CURRENT_CODEBASE="" SOFTWARE_UPDATE_PLIST=$URL DATA=$(curl $SOFTWARE_UPDATE_PLIST) #echo $DATA -#P_ID=$(cat $SOFTWARE_UPDATE_PLIST | grep ^ProductID:$tag1 | cut -d " " -f 2) -#echo "P_ID=$P_ID" idx="" regex='([A-za-z0-9.\:/]+)' From 7843d1d8838fb1feef90ea5cdf2dae01b4d35de8 Mon Sep 17 00:00:00 2001 From: ashkalokhe Date: Fri, 10 Jan 2020 15:41:08 -0500 Subject: [PATCH 07/12] added script to handle spark or spark edge and Application path vs current path --- examples/pxScene2d/src/macstuff/sparkUpdater.sh | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/examples/pxScene2d/src/macstuff/sparkUpdater.sh b/examples/pxScene2d/src/macstuff/sparkUpdater.sh index 675e8489e2..1e2d0f9688 100755 --- a/examples/pxScene2d/src/macstuff/sparkUpdater.sh +++ b/examples/pxScene2d/src/macstuff/sparkUpdater.sh @@ -66,7 +66,21 @@ if [[ $PRODUCT_ID == $CURRENT_PRODUCT_ID ]]; then if [[ $CURRENT_VERSION != $VERSION ]]; then echo "Updating..." hdiutil attach $CURRENT_CODEBASE - cp -av /Volumes/Spark/* /Applications/ + 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 From 7fdd5069936b400eed974f3bece55662584ef8e0 Mon Sep 17 00:00:00 2001 From: ashkalokhe Date: Fri, 10 Jan 2020 16:22:04 -0500 Subject: [PATCH 08/12] cleanup --- examples/pxScene2d/src/macstuff/sparkUpdater.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/pxScene2d/src/macstuff/sparkUpdater.sh b/examples/pxScene2d/src/macstuff/sparkUpdater.sh index 1e2d0f9688..079290c81a 100755 --- a/examples/pxScene2d/src/macstuff/sparkUpdater.sh +++ b/examples/pxScene2d/src/macstuff/sparkUpdater.sh @@ -81,6 +81,7 @@ if [[ $PRODUCT_ID == $CURRENT_PRODUCT_ID ]]; then cp -av /Volumes/Spark/* /Applications/ fi fi + fi fi From 9425964d31eb9195a32afeb6a805423732e3cc28 Mon Sep 17 00:00:00 2001 From: ashkalokhe Date: Thu, 23 Jan 2020 07:47:32 -0500 Subject: [PATCH 09/12] added missing cpy --- examples/pxScene2d/src/mkapp.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/pxScene2d/src/mkapp.sh b/examples/pxScene2d/src/mkapp.sh index 10446726dd..a8214c963b 100755 --- a/examples/pxScene2d/src/mkapp.sh +++ b/examples/pxScene2d/src/mkapp.sh @@ -104,6 +104,7 @@ fi cp macstuff/spark.sh $bundleBin cp macstuff/EngineRunner $bundleBin +cp macstuff/sparkUpdater.sh $bundleBin # Minify JS into Bundle... # From 5afc0fb6f1563f4467c28992e05aff142832ba2e Mon Sep 17 00:00:00 2001 From: ashkalokhe Date: Thu, 23 Jan 2020 08:26:27 -0500 Subject: [PATCH 10/12] cleanup --- examples/pxScene2d/src/mkapp.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/pxScene2d/src/mkapp.sh b/examples/pxScene2d/src/mkapp.sh index a8214c963b..6dadeba540 100755 --- a/examples/pxScene2d/src/mkapp.sh +++ b/examples/pxScene2d/src/mkapp.sh @@ -106,6 +106,7 @@ cp macstuff/spark.sh $bundleBin cp macstuff/EngineRunner $bundleBin cp macstuff/sparkUpdater.sh $bundleBin + # Minify JS into Bundle... # # For Node From f39fd4cd112e09ab7face4148dcd3d9109896d5e Mon Sep 17 00:00:00 2001 From: ashkalokhe Date: Thu, 23 Jan 2020 11:31:06 -0500 Subject: [PATCH 11/12] cleanup --- examples/pxScene2d/src/mkapp.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/examples/pxScene2d/src/mkapp.sh b/examples/pxScene2d/src/mkapp.sh index 6dadeba540..a8214c963b 100755 --- a/examples/pxScene2d/src/mkapp.sh +++ b/examples/pxScene2d/src/mkapp.sh @@ -106,7 +106,6 @@ cp macstuff/spark.sh $bundleBin cp macstuff/EngineRunner $bundleBin cp macstuff/sparkUpdater.sh $bundleBin - # Minify JS into Bundle... # # For Node From 360d5b7f300d2acc2544512674f19991b2546ecd Mon Sep 17 00:00:00 2001 From: ashkalokhe Date: Fri, 24 Jan 2020 10:57:50 -0500 Subject: [PATCH 12/12] fixed missing include --- examples/pxScene2d/src/mkapp.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/pxScene2d/src/mkapp.sh b/examples/pxScene2d/src/mkapp.sh index a8214c963b..6dadeba540 100755 --- a/examples/pxScene2d/src/mkapp.sh +++ b/examples/pxScene2d/src/mkapp.sh @@ -106,6 +106,7 @@ cp macstuff/spark.sh $bundleBin cp macstuff/EngineRunner $bundleBin cp macstuff/sparkUpdater.sh $bundleBin + # Minify JS into Bundle... # # For Node