Merge pull request #4 from wezm/bsd-macos-compat

Fix syntax error using BSD flavored sed for macOS and BSD
This commit is contained in:
Thomas Vogt 2018-03-25 22:51:16 +02:00 committed by GitHub
commit 1feab77c59
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -9,11 +9,21 @@ APP_NAME="passff"
VERSION="_VERSIONHOLDER_" VERSION="_VERSIONHOLDER_"
HOST_URL="https://github.com/passff/passff-host/releases/download/$VERSION/passff.py" HOST_URL="https://github.com/passff/passff-host/releases/download/$VERSION/passff.py"
MANIFEST_URL="https://github.com/passff/passff-host/releases/download/$VERSION/passff.json" MANIFEST_URL="https://github.com/passff/passff-host/releases/download/$VERSION/passff.json"
KERNEL_NAME=$(uname -s)
case "$KERNEL_NAME" in
*BSD*)
IS_BSD=true
;;
*)
IS_BSD=false
;;
esac
# Find target dirs for various browsers & OS'es # Find target dirs for various browsers & OS'es
# https://developer.chrome.com/extensions/nativeMessaging#native-messaging-host-location # https://developer.chrome.com/extensions/nativeMessaging#native-messaging-host-location
# https://wiki.mozilla.org/WebExtensions/Native_Messaging # https://wiki.mozilla.org/WebExtensions/Native_Messaging
if [ $(uname -s) == 'Darwin' ]; then if [ "$KERNEL_NAME" == 'Darwin' ]; then
if [ "$(whoami)" == "root" ]; then if [ "$(whoami)" == "root" ]; then
TARGET_DIR_CHROME="/Library/Google/Chrome/NativeMessagingHosts" TARGET_DIR_CHROME="/Library/Google/Chrome/NativeMessagingHosts"
TARGET_DIR_CHROMIUM="/Library/Application Support/Chromium/NativeMessagingHosts" TARGET_DIR_CHROMIUM="/Library/Application Support/Chromium/NativeMessagingHosts"
@ -116,11 +126,18 @@ else
curl -sSL "$MANIFEST_URL" > "$MANIFEST_FILE_PATH" curl -sSL "$MANIFEST_URL" > "$MANIFEST_FILE_PATH"
fi fi
# Replace path to host if [ "$KERNEL_NAME" == 'Darwin' ] || [ "$IS_BSD" = true ]; then
sed -i -e "s/PLACEHOLDER/$ESCAPED_HOST_FILE_PATH/" "$MANIFEST_FILE_PATH" # Use BSD style sed on macOS and BSD systems
# Replace path to python3 executable
# Replace path to python3 executable /usr/bin/sed -i '' "1 s@.*@#\!${PYTHON3_PATH}@" "$HOST_FILE_PATH"
sed -i "1c#\!${PYTHON3_PATH}" "$HOST_FILE_PATH" # Replace path to host
/usr/bin/sed -i '' -e "s/PLACEHOLDER/$ESCAPED_HOST_FILE_PATH/" "$MANIFEST_FILE_PATH"
else
# Replace path to python3 executable
sed -i "1c#\!${PYTHON3_PATH}" "$HOST_FILE_PATH"
# Replace path to host
sed -i -e "s/PLACEHOLDER/$ESCAPED_HOST_FILE_PATH/" "$MANIFEST_FILE_PATH"
fi
# Set permissions for the manifest so that all users can read it. # Set permissions for the manifest so that all users can read it.
chmod a+x "$HOST_FILE_PATH" chmod a+x "$HOST_FILE_PATH"