hiro/tridactyl
1
0
Fork 0
mirror of https://github.com/vale981/tridactyl synced 2025-03-05 17:41:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix native messenger breaking on OSX on update

Browse source
This commit is contained in:
Oliver Blanthorn 2018-04-28 18:01:44 +01:00
parent b6a6886fa6
commit 2f07595182
No known key found for this signature in database
GPG key ID: 2BB8C36BB504BFF3
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
native/install.sh
View file

@ -19,7 +19,8 @@ fi
mkdir -p "$manifest_home" "$XDG_DATA_HOME" mkdir -p "$manifest_home" "$XDG_DATA_HOME"
manifest_file="$manifest_home/tridactyl.json" manifest_file="$manifest_home/tridactyl.json"
native_file="$XDG_DATA_HOME/native_main.py" native_file="$XDG_DATA_HOME/native_main.py.new"
native_file_final="$XDG_DATA_HOME/native_main.py"
echo "Installing manifest here: $manifest_home" echo "Installing manifest here: $manifest_home"
echo "Installing script here: XDG_DATA_HOME: $XDG_DATA_HOME" echo "Installing script here: XDG_DATA_HOME: $XDG_DATA_HOME"
@ -34,7 +35,7 @@ else
curl -sS --create-dirs -o "$native_file" "$native_loc" curl -sS --create-dirs -o "$native_file" "$native_loc"
fi fi
native_file_escaped=$(sed 's/[&/\]/\\&/g' <<< "$native_file") native_file_escaped=$(sed 's/[&/\]/\\&/g' <<< "$native_file_final")
sed -i.bak "s/REPLACE_ME_WITH_SED/$native_file_escaped/" "$manifest_file" sed -i.bak "s/REPLACE_ME_WITH_SED/$native_file_escaped/" "$manifest_file"
chmod +x $native_file chmod +x $native_file
@ -45,6 +46,7 @@ pip_path=$(which pip3)
python_file_escaped=$(sed 's/[&/\]/\\&/g' <<< "$python_path") python_file_escaped=$(sed 's/[&/\]/\\&/g' <<< "$python_path")
if [[ -x "$python_path" ]] && [[ -x "$pip_path" ]]; then if [[ -x "$python_path" ]] && [[ -x "$pip_path" ]]; then
sed -i.bak "1s/.*/#!$python_file_escaped/" "$native_file" sed -i.bak "1s/.*/#!$python_file_escaped/" "$native_file"
mv "$native_file" "$native_file_final"
# pip3 install --user tinycss2 # pip3 install --user tinycss2
# put dependencies here # put dependencies here
else else