From 3e3bcec6004943b1d037286aa67e3cfd3fcb186a Mon Sep 17 00:00:00 2001 From: Keerthi Niranjan Date: Thu, 9 Nov 2017 20:00:11 +0530 Subject: [PATCH] SEARCH-197 - Removed the post script for installing lz4 --- installer/mac/postinstall.sh | 8 -------- js/compressionLib/index.js | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/installer/mac/postinstall.sh b/installer/mac/postinstall.sh index 5b27c70e..3cfa3869 100755 --- a/installer/mac/postinstall.sh +++ b/installer/mac/postinstall.sh @@ -4,7 +4,6 @@ tempFilePath='/tmp/sym_settings.txt' installPath="$2" configPath="/Symphony.app/Contents/config/Symphony.config" -lz4Path="/Applications/Symphony.app/Contents/library/lz4-mac" newPath=$installPath$configPath ## Get Symphony Settings from the temp file ## @@ -22,13 +21,6 @@ sed -i "" -E "s#\"launchOnStartup\" ?: ?([Tt][Rr][Uu][Ee]|[Ff][Aa][Ll][Ss][Ee])# ## Remove the temp settings file created ## rm -f $tempFilePath -## Installing the lz4 compression algorithm. -cd $lz4Path; -sudo make -echo "lz4 Make success!" -sudo make install -echo "lz4 Install Success!" - ## For launching symphony with sandbox enabled, create a shell script that is used as the launch point for the app EXEC_PATH=$installPath/Symphony.app/Contents/MacOS exec $EXEC_PATH/Symphony --install $newPath $launch_on_startup diff --git a/js/compressionLib/index.js b/js/compressionLib/index.js index 6d64e00d..25ae22f3 100644 --- a/js/compressionLib/index.js +++ b/js/compressionLib/index.js @@ -14,7 +14,7 @@ const libraryFolderPath = isDevEnv ? path.join(__dirname, '..', '..', 'library') const winArchPath = process.arch === 'ia32' ? 'lz4-win-x86.exe' : 'lz4-win-x64.exe'; const productionPath = path.join(execPath, libraryFolderPath, winArchPath); const devPath = path.join(__dirname, '..', '..', 'library', winArchPath); -const macLibraryPath = path.join(execPath, '..', 'library'); +const macLibraryPath = isDevEnv ? path.join(__dirname, '..', '..', 'library') : path.join(execPath, '..', 'library'); const lz4Path = isDevEnv ? devPath : productionPath; /**