root
/
telebit.js
mirror of https://git.coolaj86.com/coolaj86/telebit.js.git
2
2
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' into next

This commit is contained in:
AJ ONeal 2019-05-11 18:28:00 -06:00
parent 2a03e767f2 ceddf444b0
commit 23a4a230a1
2 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -123,8 +123,8 @@ Windows & Node.js
1. Install [node.js](https://nodejs.org) 1. Install [node.js](https://nodejs.org)
2. Open _Node.js_ 2. Open _Node.js_
2. Run the command `npm install -g telebit` 2. Run the command `npm install -g telebit`
2. Copy the example daemon conifg to your user folder `.config/telebit/telebitd.yml` (such as `/Users/John/.config/telebit/telebitd.yml`) 2. Copy the example daemon config to your user folder `.config/telebit/telebitd.yml` (such as `/Users/John/.config/telebit/telebitd.yml`)
2. Copy the example remote conifg to your user folder `.config/telebit/telebit.yml` (such as `/Users/John/.config/telebit/telebit.yml`) 2. Copy the example remote config to your user folder `.config/telebit/telebit.yml` (such as `/Users/John/.config/telebit/telebit.yml`)
2. Change the email address 2. Change the email address
2. Run `npx telebit init` and follow the instructions 2. Run `npx telebit init` and follow the instructions
2. Run `npx telebit list` 2. Run `npx telebit list`

11
usr/share/install_helper.sh
View File

@ -496,7 +496,8 @@ elif [ "systemd" == "$my_system_launcher" ]; then
else else
echo -n "." echo -n "."
fi fi
systemctl --user daemon-reload set +e
if systemctl --user daemon-reload; then
# enable also puts success output to stderr... why? # enable also puts success output to stderr... why?
systemctl --user enable $my_app >/dev/null 2>/dev/null systemctl --user enable $my_app >/dev/null 2>/dev/null
#echo " > systemctl --user enable systemd-tmpfiles-setup.service systemd-tmpfiles-clean.timer" #echo " > systemctl --user enable systemd-tmpfiles-setup.service systemd-tmpfiles-clean.timer"
@ -506,13 +507,19 @@ elif [ "systemd" == "$my_system_launcher" ]; then
fi fi
systemctl --user stop $my_app >/dev/null 2>/dev/null systemctl --user stop $my_app >/dev/null 2>/dev/null
systemctl --user start $my_app >/dev/null systemctl --user start $my_app >/dev/null
sleep 2; # give it time to start sleep 2; # give it time to start
_is_running=$(systemctl --user status --no-pager $my_app 2>/dev/null | grep "active.*running") _is_running=$(systemctl --user status --no-pager $my_app 2>/dev/null | grep "active.*running")
if [ -z "$_is_running" ]; then if [ -z "$_is_running" ]; then
echo "Something went wrong:" echo "Something went wrong:"
systemctl --user status --no-pager $my_app systemctl --user status --no-pager $my_app
exit 1
fi fi
else
echo "libpam-systemd is missing, which is required on Linux to register Telebit with the user launcher."
echo "sudo apt-get install -y libpam-systemd"
sudo apt-get install -y libpam-systemd
fi
set -e
echo -n "." echo -n "."
else else