Continue work on manifest scripts

4 files changed, 81 insertions, 47 deletions

diff --git a/scripts/.gitignore b/scripts/.gitignore
new file mode 100644
index 00000000..2f8a2b91
--- /dev/null
+++ b/scripts/.gitignore
@@ -0,0 +1,6 @@
+node_modules/
+
+# Cursed file
+package-lock.json
+
+s3_keys.sh
diff --git a/scripts/update_manifest.js b/scripts/update_manifest.js
index 5f64cfb4..66df75f0 100755
--- a/scripts/update_manifest.js
+++ b/scripts/update_manifest.js
@@ -2,6 +2,7 @@
 
 const fs = require("fs");
 const crypto = require("crypto");
+const path = require("path");
 const ArgumentParser = require("argparse").ArgumentParser;
 
 function isFile(file) {
@@ -63,7 +64,7 @@ manifest.versions = [{
     full: fullZipFile ? [
         {
             action: "dl",
-            url: urlBase + encodeURIComponent(fullZipFile),
+            url: urlBase + encodeURIComponent(path.basename(fullZipFile)),
             hash: crypto.createHash("sha1")
                 .update(fs.readFileSync(fullZipFile))
                 .digest("hex")
@@ -73,7 +74,7 @@ manifest.versions = [{
         ...deleteActions,
         {
             action: "dl",
-            url: urlBase + encodeURIComponent(incrementalZipFile),
+            url: urlBase + encodeURIComponent(path.basename(incrementalZipFile)),
             hash: crypto.createHash("sha1")
                 .update(fs.readFileSync(incrementalZipFile))
                 .digest("hex")
diff --git a/scripts/wasabi.sh b/scripts/wasabi.sh
new file mode 100755
index 00000000..52006526
--- /dev/null
+++ b/scripts/wasabi.sh
@@ -0,0 +1,72 @@
+#!/bin/bash
+# Updates the specified program manifest to a new archive and version
+# and uploads the new archive and manifest to S3/Wasabi.
+#
+# Requires:
+#   MANIFEST: name of the manifest file
+#   S3_ACCESS_KEY, S3_SECRET_KEY: S3 credentials
+#   ARCHIVE_FULL: name of the full archive (if desired)
+#   ARCHIVE_INCR: name of the incremental archive (if desired)
+#   VERSION: name of the new version
+
+
+# -E: inherit ERR trap by shell functions
+# -e: stop script on ERR trap
+# -u: stop script on unbound variables
+# -x: print command before running it
+# -o pipefail: fail if any command in a pipeline fails
+set -Eeuxo pipefail
+
+aws configure set aws_access_key_id ${S3_ACCESS_KEY}
+aws configure set aws_secret_access_key ${S3_SECRET_KEY}
+aws configure set default.region us-east-1
+
+export S3_COPY="aws s3 cp --endpoint-url=https://s3.wasabisys.com"
+export S3_MANIFESTS="s3://ao-manifests"
+export S3_ARCHIVES="s3://ao-downloads"
+
+#export VERSION=$(git describe --tags)
+#export ARCHIVE_FULL="vanilla_full_${VERSION}_${ARTIFACT_SUFFIX}"
+export ARCHIVE_FULL_ARG=""
+#export ARCHIVE_INCR="vanilla_update_${VERSION}_${ARTIFACT_SUFFIX}"
+export ARCHIVE_INCR_ARG=""
+
+export LAST_TAGGED_VERSION=$(git rev-list --tags --skip=1 --max-count=1)
+echo "Previous tagged version: ${LAST_TAGGED_VERSION}"
+echo "Current tagged version: ${VERSION}"
+
+if [[ -n $ARCHIVE_INCR && -n $LAST_TAGGED_VERSION ]]; then
+    echo "Incremental archive: ${ARCHIVE_INCR}"
+
+    # Get deleted files
+    export DELETIONS_FILE="deletions.txt"
+    git log --diff-filter=D --summary ${LAST_TAGGED_VERSION}..HEAD | \
+        grep "delete mode" | cut -d' ' -f 5- > ${DELETIONS_FILE}
+
+    # Get added/modified files
+    git log --name-only --oneline --diff-filter=d ec5c..HEAD | \
+        grep -v -E "^[0-9a-f]{7} " | sort -u | zip ${ARCHIVE_INCR} -@
+
+    export ARCHIVE_INCR_ARG="-i ${ARCHIVE_INCR} ${DELETIONS_FILE}"
+elif [[ -n $ARCHIVE_INCR && -z $LAST_TAGGED_VERSION ]]; then
+    echo "Incremental archive was requested, but there is no previous version"
+fi
+
+if [[ -n $ARCHIVE_FULL ]]; then
+    echo "Full archive: ${ARCHIVE_INCR}"
+    export ARCHIVE_FULL_ARG="-f ${ARCHIVE_FULL}"
+fi
+
+${S3_COPY} ${S3_MANIFESTS}/${MANIFEST} .
+node $(dirname $0)/update_manifest.js ${MANIFEST} ${VERSION} \
+    ${ARCHIVE_FULL_ARG} ${ARCHIVE_INCR_ARG}
+
+if [[ -n $ARCHIVE_INCR_ARG ]]; then
+    ${S3_COPY} ${ARCHIVE_INCR} ${S3_ARCHIVES}
+fi
+
+if [[ -n $ARCHIVE_FULL_ARG ]]; then
+    ${S3_COPY} ${ARCHIVE_FULL} ${S3_ARCHIVES}
+fi
+
+${S3_COPY} ${MANIFEST} ${S3_MANIFESTS}
diff --git a/scripts/wasabi_asset.sh b/scripts/wasabi_asset.sh
deleted file mode 100755
index d424183a..00000000
--- a/scripts/wasabi_asset.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash
-# Updates the specified program manifest to a new archive and version
-# and uploads the new archive and manifest to S3/Wasabi.
-#
-# Requires:
-#   MANIFEST: name of the manifest file
-#   ARTIFACT_SUFFIX: suffix of the archive to be uploaded (including extension)
-#   S3_ACCESS_KEY and S3_SECRET_KEY
-
-
-# -E: inherit ERR trap by shell functions
-# -e: stop script on ERR trap
-# -u: stop script on unbound variables
-# -x: print command before running it
-# -o pipefail: fail if any command in a pipeline fails
-set -Eeuxo pipefail
-
-aws configure set aws_access_key_id ${S3_ACCESS_KEY}
-aws configure set aws_secret_access_key ${S3_SECRET_KEY}
-aws configure set default.region us-east-1
-
-export S3_COPY="aws s3 cp --endpoint-url=https://s3.wasabisys.com"
-export S3_MANIFESTS="s3://ao-manifests"
-export S3_ARCHIVES="s3://ao-downloads"
-
-export VERSION=$(git describe --tags)
-export ARCHIVE_FULL="vanilla_full_${VERSION}_${ARTIFACT_SUFFIX}"
-export ARCHIVE_INCR="vanilla_update_${VERSION}_${ARTIFACT_SUFFIX}"
-
-git log --diff-filter=D --summary $(git rev-list --tags --skip=1 --max-count=1)..HEAD | \
-    grep "delete mode" | cut -d' ' -f 5- > deletions.txt
-
-${S3_COPY} ${S3_MANIFESTS}/${MANIFEST} .
-if [[ -n FULL_ZIP && FULL_ZIP != '0' ]]; then
-    node $(dirname $0)/update_manifest.js ${MANIFEST} ${VERSION}
-        -f ${ARCHIVE_FULL} -i ${ARCHIVE_INCR} deletions.txt
-    ${S3_COPY} ${ARCHIVE_FULL} ${S3_ARCHIVES}
-else
-    node $(dirname $0)/update_manifest.js ${MANIFEST} ${VERSION}
-        -i ${ARCHIVE_INCR} deletions.txt
-fi
-${S3_COPY} ${ARCHIVE_INCR} ${S3_ARCHIVES}
-${S3_COPY} ${MANIFEST} ${S3_MANIFESTS}
-
-rm -f ${MANIFEST}