coolaj86/telebit.js
1
2
Fork 1
Code Issues 48 Pull Requests 3 Releases Activity

installer updates for zip/windows

Browse Source
This commit is contained in:
AJ ONeal 2019-08-10 14:50:48 -06:00
parent b6d4230de4
commit 944731f443
1 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
usr/share/install.sh
View File

@ -252,14 +252,14 @@ my_file="$my_dir.$archive_ext"
if [ -f "$HOME/Downloads/$my_file" ]; then if [ -f "$HOME/Downloads/$my_file" ]; then
my_size=$(($(wc -c < "$HOME/Downloads/$my_file"))) my_size=$(($(wc -c < "$HOME/Downloads/$my_file")))
if [ "$my_size" -eq "$size" ]; then if [ "$my_size" -eq "$size" ]; then
echo "~/Downloads/ exists, skipping download" echo "~/Downloads/$my_file exists, skipping download"
else else
echo "Removing corrupt download '~/Downloads/$my_file'" echo "Removing incomplete download '~/Downloads/$my_file'"
# change into $HOME because we don't ever want to perform # change into $HOME because we don't ever want to perform
# a destructive action on a variable we didn't set # a destructive action on a variable we didn't set
pushd "$HOME" pushd "$HOME" > /dev/null
rm -f "Downloads/$my_file" rm -f "Downloads/$my_file"
popd popd > /dev/null
fi fi
fi fi
@ -275,12 +275,25 @@ if [ ! -f "$HOME/Downloads/$my_file" ]; then
fi fi
echo "Unpacking and installing Telebit ..." echo "Unpacking and installing Telebit ..."
echo ""
unarchiver "$HOME/Downloads/$my_file" "$my_tmp" unarchiver "$HOME/Downloads/$my_file" "$my_tmp"
echo "extracting '$my_file' to '$my_tmp'" # because unzip can't strip a prfeix
pushd "$my_tmp" > /dev/null
if [ -d ./telebit-* ]; then
mv ./telebit-*/* "./"
rm -rf ./telebit-*
fi
popd > /dev/null
echo "Extracted '$my_file' to '$my_tmp'"
# On linux npm is a javascript file, but on Windows (Git Bash) it's both sh and cmd,
# so we need to make sure *this* node is first in the path for this script
OLD_PATH="$PATH"
export PATH="$my_tmp/bin/:$OLD_PATH"
# make sure that telebit is not in use # make sure that telebit is not in use
pushd "$my_tmp" > /dev/null pushd "$my_tmp" > /dev/null
./bin/node ./bin/npm --scripts-prepend-node-path=true run preinstall ./bin/npm --scripts-prepend-node-path=true run preinstall
popd > /dev/null popd > /dev/null
# move only once there are not likely to be any open files # move only once there are not likely to be any open files
@ -292,10 +305,14 @@ pushd "$HOME" > /dev/null
mv "$my_tmp" ".local/opt/telebit" mv "$my_tmp" ".local/opt/telebit"
popd > /dev/null popd > /dev/null
# On linux npm is a javascript file, but on Windows (Git Bash) it's both sh and cmd,
# so we need to make sure *this* node is first in the path for this script
export PATH="$HOME/.local/opt/telebit/bin/:$OLD_PATH"
# make sure that telebit is not in use # make sure that telebit is not in use
pushd "$HOME/.local/opt/telebit" > /dev/null pushd "$HOME/.local/opt/telebit" > /dev/null
./node_modules/.bin/pathman add "$HOME/.local/opt/telebit/bin-public" > /dev/null ./node_modules/.bin/pathman add "$HOME/.local/opt/telebit/bin-public" > /dev/null
./bin/node ./bin/npm --scripts-prepend-node-path=true run postinstall ./bin/npm --scripts-prepend-node-path=true run postinstall
popd > /dev/null popd > /dev/null
echo "" echo ""