From caf49db14054b75dc456e94076aa4655f0301899 Mon Sep 17 00:00:00 2001 From: Geoffrey Frogeye Date: Sun, 17 Sep 2017 11:36:17 +0000 Subject: [PATCH] Termux service love --- bashrc | 7 ++--- .dmrc => dmrc | 0 scripts/install-prefs | 2 +- termux/bin/.gitignore | 2 ++ termux/scripts/service | 22 ++++++++++++++ termux/scripts/sudo | 6 ++++ termux/services/syncthing | 61 +++++++++++++++++++++++++++++++++++++++ 7 files changed, 95 insertions(+), 5 deletions(-) rename .dmrc => dmrc (100%) create mode 100644 termux/bin/.gitignore create mode 100755 termux/scripts/service create mode 100755 termux/scripts/sudo create mode 100755 termux/services/syncthing diff --git a/bashrc b/bashrc index 1abcdeb..4232913 100644 --- a/bashrc +++ b/bashrc @@ -4,10 +4,6 @@ # ENVIRONMENT VARIABLES -# Region preferences -export LANG=fr_FR.utf8 -export TZ=/usr/share/zoneinfo/Europe/Paris - # Favourite commands export PAGER=less export EDITOR=vim @@ -19,6 +15,9 @@ export PATH="/usr/lib/ccache/bin/:$PATH" if [ -d $HOME/.gem/ruby/2.4.0/bin ]; then export PATH="$HOME/.gem/ruby/2.4.0/bin/:$PATH" fi +if [ -d /data/data/com.termux/ ]; then + export PATH="$HOME/.termux/scripts:$HOME/.termux/bin:$PATH" +fi #export PATH="$(echo "$PATH" | sed 's|:|\n|g' | sort | uniq | tr '\n' ':' | sed 's|:$||')" export JAVA_FONTS=/usr/share/fonts/TTF export ANDROID_HOME=/opt/android-sdk diff --git a/.dmrc b/dmrc similarity index 100% rename from .dmrc rename to dmrc diff --git a/scripts/install-prefs b/scripts/install-prefs index b811d6d..022531e 100755 --- a/scripts/install-prefs +++ b/scripts/install-prefs @@ -293,7 +293,7 @@ if [ $EXTRA == 1 ]; then inst cmake clang llvm npm # Extra CLI - inst sl ffmpeg youtube-dl optipng + inst sl ffmpeg youtube-dl optipng syncthing if [ $ARCH == 1 ]; then inst jq diff --git a/termux/bin/.gitignore b/termux/bin/.gitignore new file mode 100644 index 0000000..d6b7ef3 --- /dev/null +++ b/termux/bin/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore diff --git a/termux/scripts/service b/termux/scripts/service new file mode 100755 index 0000000..300cdfa --- /dev/null +++ b/termux/scripts/service @@ -0,0 +1,22 @@ +#!/data/data/com.termux/files/usr/bin/bash +# +# Run & stop Termux services +# + +if [ $# -lt 1 ] +then + echo "Expected a service name as first argument." + exit 1 +fi + +service="$1" +file="$HOME/.termux/services/$1" + +if [ -f "$file" ] +then + shift + $file "$@" +else + echo "Service not found: $1" +fi + diff --git a/termux/scripts/sudo b/termux/scripts/sudo new file mode 100755 index 0000000..f410dbc --- /dev/null +++ b/termux/scripts/sudo @@ -0,0 +1,6 @@ +#!/data/data/com.termux/files/usr/bin/bash +# +# Substitution for sudo +# + +echo "$@" | tsu diff --git a/termux/services/syncthing b/termux/services/syncthing new file mode 100755 index 0000000..d2e0215 --- /dev/null +++ b/termux/services/syncthing @@ -0,0 +1,61 @@ +#!/data/data/com.termux/files/usr/bin/bash +# +# Start Syncthing synchronization service +# + +PIDFILE="$HOME/.local/run/syncthing.pid" +LOGFILE="$HOME/.local/log/syncthing.log" + +start() { + printf "Starting Syncthing: " + sudo start-stop-daemon -p "$PIDFILE" -x syncthing -S -b -N 5 -m -- -logfile="$LOGFILE" + termux-toast "Started Syncthing" + echo "OK" +} + +stop() { + printf "Stopping Syncthing: " + sudo start-stop-daemon -p "$PIDFILE" -x syncthing -K + termux-toast "Stopped Syncthing" + echo "OK" +} + +status() { + printf "Syncthing: " + PID="$(sudo cat "$PIDFILE")" + if [[ -n "$PID" && -d "/proc/$PID" ]] + then + echo "running" + else + echo "stopped" + fi +} + +log() { + sudo tail "$@" "$LOGFILE" +} + +case "$1" in + start) + start + ;; + stop) + stop + ;; + restart|reload) + stop + start + ;; + status) + status + ;; + log) + shift + log "$@" + ;; + *) + echo "Usage: $0 {start|stop|restart|status|log}" + exit 1 +esac + +exit $?