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

update whitespace

Browse Source
This commit is contained in:
AJ ONeal 2018-06-07 10:50:35 -06:00
parent d1aa1f2958
commit f39822875a
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
usr/share/install_helper.sh
View File

@ -138,7 +138,7 @@ export PATH="$TELEBIT_PATH/bin:$PATH"
sleep 0.25 sleep 0.25
echo "(your password may be required to complete installation)" echo "(your password may be required to complete installation)"
echo " - installing node.js runtime..." echo " - installing node.js runtime..."
http_bash https://git.coolaj86.com/coolaj86/node-installer.sh/raw/branch/master/install.sh --no-dev-deps >/dev/null 2>/dev/null http_bash https://git.coolaj86.com/coolaj86/node-installer.sh/raw/branch/master/install.sh --no-dev-deps >/dev/null 2>/dev/null
my_tree="telebit" # my_branch my_tree="telebit" # my_branch
@ -164,7 +164,7 @@ my_unzip=$(type -p unzip)
my_tar=$(type -p tar) my_tar=$(type -p tar)
if [ -n "$my_unzip" ]; then if [ -n "$my_unzip" ]; then
rm -f $my_tmp/$my_app-$my_tree.zip rm -f $my_tmp/$my_app-$my_tree.zip
echo " - installing telebit zip..." echo " - installing telebit zip..."
http_get https://git.coolaj86.com/coolaj86/$my_repo/archive/$my_tree.zip $my_tmp/$my_app-$my_tree.zip http_get https://git.coolaj86.com/coolaj86/$my_repo/archive/$my_tree.zip $my_tmp/$my_app-$my_tree.zip
# -o means overwrite, and there is no option to strip # -o means overwrite, and there is no option to strip
$my_unzip -o $my_tmp/$my_app-$my_tree.zip -d $TELEBIT_PATH/ > /dev/null 2>&1 $my_unzip -o $my_tmp/$my_app-$my_tree.zip -d $TELEBIT_PATH/ > /dev/null 2>&1
@ -172,7 +172,7 @@ if [ -n "$my_unzip" ]; then
rm -rf $TELEBIT_PATH/$my_bin rm -rf $TELEBIT_PATH/$my_bin
elif [ -n "$my_tar" ]; then elif [ -n "$my_tar" ]; then
rm -f $my_tmp/$my_app-$my_tree.tar.gz rm -f $my_tmp/$my_app-$my_tree.tar.gz
echo " - installing telebit tar.gz..." echo " - installing telebit tar.gz..."
http_get https://git.coolaj86.com/coolaj86/$my_repo/archive/$my_tree.tar.gz $my_tmp/$my_app-$my_tree.tar.gz http_get https://git.coolaj86.com/coolaj86/$my_repo/archive/$my_tree.tar.gz $my_tmp/$my_app-$my_tree.tar.gz
ls -lah $my_tmp/$my_app-$my_tree.tar.gz ls -lah $my_tmp/$my_app-$my_tree.tar.gz
$my_tar -xzf $my_tmp/$my_app-$my_tree.tar.gz --strip 1 -C $TELEBIT_PATH/ $my_tar -xzf $my_tmp/$my_app-$my_tree.tar.gz --strip 1 -C $TELEBIT_PATH/
@ -183,11 +183,11 @@ fi
set -e set -e
pushd $TELEBIT_PATH >/dev/null pushd $TELEBIT_PATH >/dev/null
echo " - installing telebit npm dependencies..." echo " - installing telebit npm dependencies..."
$my_npm install >/dev/null 2>/dev/null $my_npm install >/dev/null 2>/dev/null
popd >/dev/null popd >/dev/null
echo " - configuring telebit..." echo " - configuring telebit..."
cat << EOF > $TELEBIT_PATH/bin/$my_app cat << EOF > $TELEBIT_PATH/bin/$my_app
#!/bin/bash #!/bin/bash
@ -348,7 +348,7 @@ elif [ -d "$my_root/etc/systemd/system" ]; then
$sudo_cmd systemctl restart $my_app $sudo_cmd systemctl restart $my_app
fi fi
sleep 1 sleep 2
echo "" echo ""
echo "" echo ""
echo "" echo ""
@ -424,6 +424,8 @@ sleep 3
# TODO run 'telebit status' # TODO run 'telebit status'
if [ "telebit.cloud" == $my_relay ]; then if [ "telebit.cloud" == $my_relay ]; then
echo ""
echo ""
echo "==============================================" echo "=============================================="
echo " Hey, Listen! " echo " Hey, Listen! "
echo "==============================================" echo "=============================================="