gaschz/passff-host
1
0
Fork 0
mirror of https://codeberg.org/gaschz/passff-host.git synced 2025-06-06 18:08:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Don't rely on sed's OS-specific behaviour

Browse Source 
Signed-off-by: Olivier Mehani <olivier.mehani@learnosity.com>
This commit is contained in:
Olivier Mehani 2018-04-04 10:45:28 +10:00
parent 77f8dbbd66
commit 5799795fe5
No known key found for this signature in database
GPG Key ID: E9566B9D0957D2D3
1 changed files with 17 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/install_host_app.sh
View File

@ -108,45 +108,32 @@ fi
HOST_FILE_PATH="$TARGET_DIR/$APP_NAME.py" HOST_FILE_PATH="$TARGET_DIR/$APP_NAME.py"
MANIFEST_FILE_PATH="$TARGET_DIR/$APP_NAME.json" MANIFEST_FILE_PATH="$TARGET_DIR/$APP_NAME.json"
ESCAPED_HOST_FILE_PATH="${HOST_FILE_PATH////\\/}"
echo "Installing $BROWSER_NAME host config" echo "Installing $BROWSER_NAME host config"
# Create config dir if not existing # Create config dir if not existing
mkdir -p "$TARGET_DIR" mkdir -p "$TARGET_DIR"
# Replace path to python3 executable \
# Replace path to pass (only in a line starting with "COMMAND =") \
# Set the PATH to match this script's \
HOST_SED=" \
1 s@.*@#!${PYTHON3_PATH}@; \
/^COMMAND *=/s@\"pass\"@\"$PASS_PATH\"@; \
s@\"PATH\":.*@\"PATH\": \"$PATH\"@; \
"
# Replace path to host \
MANIFEST_SED=" \
s@PLACEHOLDER@$HOST_FILE_PATH@; \
"
if [ "$USE_LOCAL_FILES" = true ]; then if [ "$USE_LOCAL_FILES" = true ]; then
DIR="$( cd "$( dirname "$0" )" && pwd )" sed -e "${HOST_SED}" "$(dirname "$0")/passff.py" > "$HOST_FILE_PATH"
cp "$DIR/passff.py" "$HOST_FILE_PATH" sed -e "${MANIFEST_SED}" "$(dirname "$0")/passff.json" > "$MANIFEST_FILE_PATH"
cp "$DIR/passff.json" "$MANIFEST_FILE_PATH"
else else
# Download native host script and manifest # Download native host script and manifest
curl -sSL "$HOST_URL" > "$HOST_FILE_PATH" curl -sSL "$HOST_URL" | sed -e "${HOST_SED}" > "$HOST_FILE_PATH"
curl -sSL "$MANIFEST_URL" > "$MANIFEST_FILE_PATH" curl -sSL "$MANIFEST_URL" | sed -e "${MANIFEST_SED}" > "$MANIFEST_FILE_PATH"
fi
if [ "$IS_BSD" = true ]; then
# Use BSD style sed on BSD-ish systems
# Replace path to python3 executable
/usr/bin/sed -i '' "1 s@.*@#\!${PYTHON3_PATH}@" "$HOST_FILE_PATH"
# Replace path to pass (only in a line starting with `COMMAND =`)
/usr/bin/sed -i '' "/^COMMAND *=/s@\"pass\"@\"$PASS_PATH\"@" "$HOST_FILE_PATH"
# Set the PATH to match this script's
/usr/bin/sed -i '' "s@\"PATH\":.*@\"PATH\": \"$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 "1 s@.*@#\!${PYTHON3_PATH}@" "$HOST_FILE_PATH"
# Replace path to pass (only in a line starting with `COMMAND =`)
/usr/bin/sed -i -e "/^COMMAND *=/s@\"pass\"@\"$PASS_PATH\"@" "$HOST_FILE_PATH"
# Set the PATH to match this script's
/usr/bin/sed -i -e "s@\"PATH\":.*@\"PATH\": \"$PATH\"@" "$HOST_FILE_PATH"
# Replace path to host
sed -i -e "s/PLACEHOLDER/$ESCAPED_HOST_FILE_PATH/" "$MANIFEST_FILE_PATH"
fi 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.