Include repacked revision

notion-enhancer · Jul 4, 2021 · 3e8809d · 3e8809d
1 parent 7fe0af7
commit 3e8809d
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 5 deletions.
diff --git a/electron-builder.js b/electron-builder.js
@@ -1,11 +1,26 @@
-const editionEnv = process.env.NOTION_REPACKAGED_EDITION || 'vanilla';
+function ensureEnvVar(envVarName) {
+  if (!(envVarName in process.env)) {
+    throw new Error(`Missing environment variable ${envVarName}`);
+  }
+
+  return process.env[envVarName];
+}
+
+const editionEnvVar = ensureEnvVar('NOTION_REPACKAGED_EDITION'),
+  versionEnvVar = ensureEnvVar('NOTION_VERSION'),
+  revisionEnvVar = ensureEnvVar('NOTION_REPACKAGED_REVISION');
+
+const versionFpmOptions = [
+  `--version=${versionEnvVar}`, 
+  `--iteration=${revisionEnvVar}`
+];
 
 module.exports = {
-  asar: editionEnv === 'vanilla',
-  productName: editionEnv === 'vanilla' ? 'Notion' : 'Notion Enhanced',
+  asar: editionEnvVar === 'vanilla',
+  productName: editionEnvVar === 'vanilla' ? 'Notion' : 'Notion Enhanced',
   extraMetadata: {
     description:
-      editionEnv === 'vanilla'
+      editionEnvVar === 'vanilla'
         ? 'The all-in-one workspace for your notes and tasks'
         : 'The all-in-one workspace for your notes and tasks, but enhanced',
   },
@@ -44,5 +59,7 @@ module.exports = {
     },
     target: ['AppImage', 'deb', 'rpm', 'pacman', 'zip'],
   },
+  pacman: { fpm: versionFpmOptions },
+  rpm: { fpm: versionFpmOptions },
   publish: ['github'],
 };
diff --git a/scripts/_utils.sh b/scripts/_utils.sh
@@ -1,3 +1,4 @@
+set -a
 
 WORKSPACE_DIR=`realpath $(dirname $0)/..`
 
@@ -16,10 +17,13 @@ NOTION_ENHANCED_SRC_NAME="enhanced-src"
 NOTION_EMBEDDED_NAME="embedded_enhancer"
 
 NOTION_REPACKAGED_REVISION="${NOTION_REPACKAGED_REVISION:-1}"
+NOTION_REPACKAGED_VERSION_REV="${NOTION_VERSION}-${NOTION_REPACKAGED_REVISION}"
 NOTION_REPACKAGED_HOMEPAGE="https://github.com/jamezrin/notion-repackaged"
 NOTION_REPACKAGED_REPO=${NOTION_REPACKAGED_REPO:-${NOTION_REPACKAGED_HOMEPAGE}}
 NOTION_REPACKAGED_AUTHOR="Notion Repackaged"
 
+set +a
+
 function log() {
   caller=`basename "$0"`
   echo "[${caller%.*}]: $@"

diff --git a/scripts/extract-src.sh b/scripts/extract-src.sh
@@ -44,11 +44,13 @@ PATCHED_PACKAGE_JSON=$(jq \
   --arg homepage "${NOTION_REPACKAGED_HOMEPAGE}" \
   --arg repo "${NOTION_REPACKAGED_REPO}" \
   --arg author "${NOTION_REPACKAGED_AUTHOR}" \
+  --arg version "${NOTION_REPACKAGED_VERSION_REV}" \
   '.dependencies.cld="2.7.0" | 
   .name="notion-app" | 
   .homepage=$homepage | 
   .repository=$repo | 
-  .author=$author' package.json
+  .author=$author | 
+  .version=$version' package.json
 )
 echo "${PATCHED_PACKAGE_JSON}" > package.json