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

minor windows fixes

This commit is contained in:
AJ ONeal 2019-08-10 16:45:44 -06:00
parent f266559cff
commit 7cf8c529dd
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/preinstall.js
View File

@ -22,7 +22,11 @@ function run(bin, args) {
out += txt; out += txt;
}); });
runner.on('exit', function(code) { runner.on('exit', function(code) {
if (0 !== code && !/service matching/.test(out)) { if (
0 !== code &&
!/service matching/.test(out) &&
!/no pid file/.test(out)
) {
console.error(out); console.error(out);
reject( reject(
new Error("exited with non-zero status code '" + code + "'") new Error("exited with non-zero status code '" + code + "'")

14
usr/share/install.sh
View File

@ -217,9 +217,9 @@ echo " Download Type: $archive_ext"
echo " Release Channel: $TELEBIT_VERSION" echo " Release Channel: $TELEBIT_VERSION"
echo "" echo ""
sleep 0.3 sleep 0.3
echo "Downloading the Telebit installer for your system..." #echo "Downloading the Telebit installer for your system..."
sleep 0.5 #sleep 0.5
echo "" #echo ""
#if [ -e "usr/share/install_helper.sh" ]; then #if [ -e "usr/share/install_helper.sh" ]; then
# bash usr/share/install_helper.sh "$@" # bash usr/share/install_helper.sh "$@"
@ -253,6 +253,7 @@ 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/$my_file exists, skipping download" echo "~/Downloads/$my_file exists, skipping download"
sleep 0.5
else else
echo "Removing incomplete 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
@ -311,7 +312,12 @@ 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 if [[ "$OSTYPE" == "cygwin" ]] || [[ "$OSTYPE" == "msys" ]]; then
./node_modules/.bin/pathman add '%USERPROFILE%\.local\opt\telebit\bin-public' > /dev/null &
sleep 0.1 # workaround for pathman not exiting as it should on Windows
else
./node_modules/.bin/pathman add "$HOME/.local/opt/telebit/bin-public" > /dev/null
fi
./bin/npm --scripts-prepend-node-path=true run postinstall ./bin/npm --scripts-prepend-node-path=true run postinstall
popd > /dev/null popd > /dev/null