diff --git a/README.md b/README.md index eb9b26c..0d9ad34 100644 --- a/README.md +++ b/README.md @@ -123,8 +123,8 @@ Windows & Node.js 1. Install [node.js](https://nodejs.org) 2. Open _Node.js_ 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 remote conifg to your user folder `.config/telebit/telebit.yml` (such as `/Users/John/.config/telebit/telebit.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 config to your user folder `.config/telebit/telebit.yml` (such as `/Users/John/.config/telebit/telebit.yml`) 2. Change the email address 2. Run `npx telebit init` and follow the instructions 2. Run `npx telebit list` diff --git a/usr/share/install_helper.sh b/usr/share/install_helper.sh index 3a9bc68..8a8c2c6 100644 --- a/usr/share/install_helper.sh +++ b/usr/share/install_helper.sh @@ -496,23 +496,30 @@ elif [ "systemd" == "$my_system_launcher" ]; then else echo -n "." fi - systemctl --user daemon-reload - # enable also puts success output to stderr... why? - systemctl --user enable $my_app >/dev/null 2>/dev/null - #echo " > systemctl --user enable systemd-tmpfiles-setup.service systemd-tmpfiles-clean.timer" - #systemctl --user enable systemd-tmpfiles-setup.service systemd-tmpfiles-clean.timer - if [ -n "${TELEBIT_DEBUG}" ]; then - echo " > systemctl --user start $my_app" - fi - systemctl --user stop $my_app >/dev/null 2>/dev/null - systemctl --user start $my_app >/dev/null - sleep 2; # give it time to start - _is_running=$(systemctl --user status --no-pager $my_app 2>/dev/null | grep "active.*running") - if [ -z "$_is_running" ]; then - echo "Something went wrong:" - systemctl --user status --no-pager $my_app - exit 1 + set +e + if systemctl --user daemon-reload; then + # enable also puts success output to stderr... why? + systemctl --user enable $my_app >/dev/null 2>/dev/null + #echo " > systemctl --user enable systemd-tmpfiles-setup.service systemd-tmpfiles-clean.timer" + #systemctl --user enable systemd-tmpfiles-setup.service systemd-tmpfiles-clean.timer + if [ -n "${TELEBIT_DEBUG}" ]; then + echo " > systemctl --user start $my_app" + fi + systemctl --user stop $my_app >/dev/null 2>/dev/null + systemctl --user start $my_app >/dev/null + + sleep 2; # give it time to start + _is_running=$(systemctl --user status --no-pager $my_app 2>/dev/null | grep "active.*running") + if [ -z "$_is_running" ]; then + echo "Something went wrong:" + systemctl --user status --no-pager $my_app + 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 "." else