Merge pull request #286 from paritytech/luke-285-script-sed-error

fix: Fixes #285 sed error on macOS
openethereum · Dec 13, 2018 · 2cb5494 · 2cb5494
2 parents 844c657 + db79274
commit 2cb5494
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/packages/fether-electron/scripts/fixElectronBug.sh b/packages/fether-electron/scripts/fixElectronBug.sh
@@ -7,6 +7,7 @@ FIND='process.resourcesPath + "\/static"'
 REPLACE='"${path.join(configurator.projectDir, "static").replace(\/\\\\\/g, "\\\\\\\\")}"'
 FILE='./node_modules/electron-webpack/out/targets/MainTarget.js'
 case "$OSTYPE" in
-  darwin*)  sed -i '.bak' "s/$FIND/$REPLACE/g" $FILE ;; 
+  # On macOS (darwin), run the in-built Sed binary explicitly to avoid any conflicts with GNU Sed
+  darwin*)  /usr/bin/sed -i '.bak' "s/$FIND/$REPLACE/g" $FILE ;;
   *)        sed -i "s/$FIND/$REPLACE/g" $FILE ;;
 esac
diff --git a/packages/fether-electron/scripts/revertElectronBug.sh b/packages/fether-electron/scripts/revertElectronBug.sh
@@ -5,6 +5,6 @@ FIND='"${path.join(configurator.projectDir, "static").replace(\/\\\\\/g, "\\\\\\
 REPLACE='process.resourcesPath + "\/static"'
 FILE='./node_modules/electron-webpack/out/targets/MainTarget.js'
 case "$OSTYPE" in
-  darwin*)  sed -i '.bak' "s/$FIND/$REPLACE/g" $FILE ;; 
+  darwin*)  /usr/bin/sed -i '.bak' "s/$FIND/$REPLACE/g" $FILE ;;
   *)        sed -i "s/$FIND/$REPLACE/g" $FILE ;;
 esac