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

Install a functional host helper on OS X

Browse Source 
Signed-off-by: Olivier Mehani <olivier.mehani@learnosity.com>
This commit is contained in:
Olivier Mehani 2018-03-29 13:50:46 +11:00
parent d26f22d6e7
commit e9c729e071
No known key found for this signature in database
GPG Key ID: E9566B9D0957D2D3
2 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/install_host_app.sh
View File

@ -11,8 +11,10 @@ HOST_URL="https://github.com/passff/passff-host/releases/download/$VERSION/passf
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) KERNEL_NAME=$(uname -s)
PATH="/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"
case "$KERNEL_NAME" in case "$KERNEL_NAME" in
*BSD*) *BSD* | *Darwin*)
IS_BSD=true IS_BSD=true
;; ;;
*) *)
@ -102,6 +104,14 @@ else
exit 1 exit 1
fi fi
PASS_PATH="$(which pass)"
if [ -x "$PASS_PATH" ]; then
echo "Pass executable located at $PASS_PATH"
else
echo "Pass executable not found, but Pass is required for PassFF to work!"
exit 1
fi
if [ -z "$TARGET_DIR" ]; then if [ -z "$TARGET_DIR" ]; then
usage usage
exit 1 exit 1
@ -126,16 +136,26 @@ else
curl -sSL "$MANIFEST_URL" > "$MANIFEST_FILE_PATH" curl -sSL "$MANIFEST_URL" > "$MANIFEST_FILE_PATH"
fi fi
# When using sed on macOS, backup extension is an mandatory argument if [ "$IS_BSD" = true ]; then
# whereas on GNU sed or BSD sed backup extension may be omit. # Use BSD style sed on BSD-ish systems
if [ "$KERNEL_NAME" == 'Darwin' ]; then
# Replace path to python3 executable # Replace path to python3 executable
/usr/bin/sed -i '' "1 s@.*@#\!${PYTHON3_PATH}@" "$HOST_FILE_PATH" /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 # Replace path to host
/usr/bin/sed -i '' -e "s/PLACEHOLDER/$ESCAPED_HOST_FILE_PATH/" "$MANIFEST_FILE_PATH" /usr/bin/sed -i '' -e "s/PLACEHOLDER/$ESCAPED_HOST_FILE_PATH/" "$MANIFEST_FILE_PATH"
else else
# Replace path to python3 executable # Replace path to python3 executable
sed -i "1 s@.*@#\!${PYTHON3_PATH}@" "$HOST_FILE_PATH" 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 # Replace path to host
sed -i -e "s/PLACEHOLDER/$ESCAPED_HOST_FILE_PATH/" "$MANIFEST_FILE_PATH" sed -i -e "s/PLACEHOLDER/$ESCAPED_HOST_FILE_PATH/" "$MANIFEST_FILE_PATH"
fi fi

7
src/passff.py
View File

@ -12,14 +12,11 @@ VERSION = "_VERSIONHOLDER_"
################################################################################ ################################################################################
######################## Begin preferences section ############################# ######################## Begin preferences section #############################
################################################################################ ################################################################################
# Default command for MacOS: COMMAND = "pass"
#COMMAND = "/usr/local/bin/pass"
COMMAND = "/usr/bin/pass"
COMMAND_ARGS = [] COMMAND_ARGS = []
COMMAND_ENV = { COMMAND_ENV = {
"TREE_CHARSET": "ISO-8859-1", "TREE_CHARSET": "ISO-8859-1",
# Default PATH for MacOS: "PATH": "/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin",
#"PATH": "/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin",
} }
CHARSET = "UTF-8" CHARSET = "UTF-8"
################################################################################ ################################################################################