From df705bc77e5ad13b3af99518afcf7fc1ef402f91 Mon Sep 17 00:00:00 2001
From: David Bailey <davidbailey00@outlook.com>
Date: Tue, 13 Apr 2021 12:05:48 +0100
Subject: [PATCH] work around #42

---
 .cirrus.yml             | 8 ++++----
 scripts/_variables-2.sh | 2 +-
 scripts/enhance.sh      | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index f591831..9fc6ebd 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -34,8 +34,8 @@ package_deb_task:
   package_deb_script:
     - scripts/package-deb.sh &
     - scripts/package-deb.sh -b arm64 &
-    - scripts/package-deb.sh -n notion-enhanced &
-    - scripts/package-deb.sh -n notion-enhanced -b arm64 &
+    - scripts/package-deb.sh -n notionenhanced &
+    - scripts/package-deb.sh -n notionenhanced -b arm64 &
     - wait
     - "[[ $(ls out/debs | wc -l) == 4 ]]"
   deb_artifacts:
@@ -55,8 +55,8 @@ package_rpm_task:
   package_rpm_script:
     - scripts/package-rpm.sh &
     - scripts/package-rpm.sh -b arm64 &
-    - scripts/package-rpm.sh -n notion-enhanced &
-    - scripts/package-rpm.sh -n notion-enhanced -b arm64 &
+    - scripts/package-rpm.sh -n notionenhanced &
+    - scripts/package-rpm.sh -n notionenhanced -b arm64 &
     - wait
     - "[[ $(ls out/rpms | wc -l) == 4 ]]"
   rpm_artifacts:
diff --git a/scripts/_variables-2.sh b/scripts/_variables-2.sh
index b90cef8..c671d09 100644
--- a/scripts/_variables-2.sh
+++ b/scripts/_variables-2.sh
@@ -6,7 +6,7 @@ BUILD_DIR=build/build-$NOTION_VERSION-$PACKAGE_REVISION-$BUILD_ARCH
 BUILD_DIR_ENHANCED=build/build-enhanced-$NOTION_VERSION-$PACKAGE_REVISION-$BUILD_ARCH
 PATH="node_modules/.bin:$PATH"
 
-if [[ "$APP_NAME" == notion-enhanced ]]; then
+if [[ "$APP_NAME" == notionenhanced ]]; then
   BUILD_DIR=$BUILD_DIR_ENHANCED
   PRODUCT_NAME='Notion Enhanced'
 fi
diff --git a/scripts/enhance.sh b/scripts/enhance.sh
index b49ac04..61e241a 100755
--- a/scripts/enhance.sh
+++ b/scripts/enhance.sh
@@ -30,8 +30,8 @@ if ! [ -d "$BUILD_DIR_ENHANCED" ]; then
   # Remove the non-enhanced app package
   rm -rf "$BUILD_DIR_ENHANCED/notion-desktop-linux-$BUILD_ARCH"
 
-  # Replace package name with `notion-enhanced`
-  sed -i 's/"notion-desktop"/"notion-enhanced"/' "$BUILD_DIR_ENHANCED/app-unpacked/package.json"
+  # Replace package name with `notionenhanced`
+  sed -i 's/"notion-desktop"/"notionenhanced"/' "$BUILD_DIR_ENHANCED/app-unpacked/package.json"
 fi
 
 if ! [ -f "$BUILD_DIR_ENHANCED/.enhanced" ]; then
@@ -58,7 +58,7 @@ if ! [ -f "$BUILD_DIR_ENHANCED/.enhanced" ]; then
 
   # Modify Notion Enhancer-patched scripts to point to the correct directories
   find "$BUILD_DIR_ENHANCED/app-unpacked" -name '*.js' \
-    -exec sed -i "s|/usr/lib/notion-desktop|/usr/lib/notion-enhanced|g" {} \; \
+    -exec sed -i "s|/usr/lib/notion-desktop|/usr/lib/notionenhanced|g" {} \; \
     -exec sed -i "s|$PWD/$BUILD_DIR_ENHANCED/app-unpacked/node_modules/notion-enhancer|notion-enhancer|g" {} \;
 
   # Mark as complete
@@ -66,7 +66,7 @@ if ! [ -f "$BUILD_DIR_ENHANCED/.enhanced" ]; then
 fi
 
 # Create Electron package
-if ! [ -d "$BUILD_DIR_ENHANCED/notion-enhanced-linux-$BUILD_ARCH" ]; then
+if ! [ -d "$BUILD_DIR_ENHANCED/notionenhanced-linux-$BUILD_ARCH" ]; then
   electron-packager "$BUILD_DIR_ENHANCED/app-unpacked" \
     --platform linux \
     --arch "$BUILD_ARCH" \