scripts: Move common parts to library

mbuesch · Jan 17, 2025 · 3244d18 · 3244d18
1 parent f15b6b7
commit 3244d18
Show file tree

Hide file tree

Showing 7 changed files with 88 additions and 211 deletions.
diff --git a/build.sh b/build.sh
@@ -3,26 +3,7 @@
 
 basedir="$(realpath "$0" | xargs dirname)"
 
-info()
-{
-    echo "--- $*"
-}
-
-error()
-{
-    echo "=== ERROR: $*" >&2
-}
-
-warning()
-{
-    echo "=== WARNING: $*" >&2
-}
-
-die()
-{
-    error "$*"
-    exit 1
-}
+. "$basedir/scripts/lib.sh"
 
 check_dynlibs()
 {

diff --git a/create-user.sh b/create-user.sh
@@ -1,26 +1,9 @@
 #!/bin/sh
 # -*- coding: utf-8 -*-
 
-info()
-{
-    echo "--- $*"
-}
-
-error()
-{
-    echo "=== ERROR: $*" >&2
-}
+basedir="$(realpath "$0" | xargs dirname)"
 
-warning()
-{
-    echo "=== WARNING: $*" >&2
-}
-
-die()
-{
-    error "$*"
-    exit 1
-}
+. "$basedir/scripts/lib.sh"
 
 entry_checks()
 {

diff --git a/install-client.sh b/install-client.sh
@@ -3,44 +3,7 @@
 
 basedir="$(realpath "$0" | xargs dirname)"
 
-info()
-{
-    echo "--- $*"
-}
-
-error()
-{
-    echo "=== ERROR: $*" >&2
-}
-
-warning()
-{
-    echo "=== WARNING: $*" >&2
-}
-
-die()
-{
-    error "$*"
-    exit 1
-}
-
-do_install()
-{
-    info "install $*"
-    install "$@" || die "Failed install $*"
-}
-
-do_chown()
-{
-    info "chown $*"
-    chown "$@" || die "Failed to chown $*"
-}
-
-do_chmod()
-{
-    info "chmod $*"
-    chmod "$@" || die "Failed to chmod $*"
-}
+. "$basedir/scripts/lib.sh"
 
 entry_checks()
 {

diff --git a/install-server.sh b/install-server.sh
@@ -3,68 +3,7 @@
 
 basedir="$(realpath "$0" | xargs dirname)"
 
-info()
-{
-    echo "--- $*"
-}
-
-error()
-{
-    echo "=== ERROR: $*" >&2
-}
-
-warning()
-{
-    echo "=== WARNING: $*" >&2
-}
-
-die()
-{
-    error "$*"
-    exit 1
-}
-
-do_install()
-{
-    info "install $*"
-    install "$@" || die "Failed install $*"
-}
-
-do_systemctl()
-{
-    info "systemctl $*"
-    systemctl "$@" || die "Failed to systemctl $*"
-}
-
-do_chown()
-{
-    info "chown $*"
-    chown "$@" || die "Failed to chown $*"
-}
-
-do_chmod()
-{
-    info "chmod $*"
-    chmod "$@" || die "Failed to chmod $*"
-}
-
-try_systemctl()
-{
-    info "systemctl $*"
-    systemctl "$@" 2>/dev/null
-}
-
-do_chown()
-{
-    info "chown $*"
-    chown "$@" || die "Failed to chown $*"
-}
-
-do_chmod()
-{
-    info "chmod $*"
-    chmod "$@" || die "Failed to chmod $*"
-}
+. "$basedir/scripts/lib.sh"
 
 entry_checks()
 {
@@ -80,26 +19,6 @@ entry_checks()
     fi
 }
 
-stop_services()
-{
-    try_systemctl stop letmeind.socket
-    try_systemctl stop letmeind.service
-    try_systemctl stop letmeinfwd.socket
-    try_systemctl stop letmeinfwd.service
-    try_systemctl disable letmeind.service
-    try_systemctl disable letmeind.socket
-    try_systemctl disable letmeinfwd.service
-    try_systemctl disable letmeinfwd.socket
-}
-
-start_services()
-{
-    do_systemctl start letmeinfwd.socket
-    do_systemctl start letmeinfwd.service
-    do_systemctl start letmeind.socket
-    do_systemctl start letmeind.service
-}
-
 install_dirs()
 {
     do_install \

diff --git a/restart.sh b/restart.sh
@@ -3,64 +3,13 @@
 
 basedir="$(realpath "$0" | xargs dirname)"
 
-info()
-{
-    echo "--- $*"
-}
-
-error()
-{
-    echo "=== ERROR: $*" >&2
-}
-
-warning()
-{
-    echo "=== WARNING: $*" >&2
-}
-
-die()
-{
-    error "$*"
-    exit 1
-}
+. "$basedir/scripts/lib.sh"
 
 entry_checks()
 {
     [ "$(id -u)" = "0" ] || die "Must be root to restart letmein."
 }
 
-do_systemctl()
-{
-    info "systemctl $*"
-    systemctl "$@" || die "Failed to systemctl $*"
-}
-
-try_systemctl()
-{
-    info "systemctl $*"
-    systemctl "$@" 2>/dev/null
-}
-
-stop_services()
-{
-    try_systemctl stop letmeind.socket
-    try_systemctl stop letmeind.service
-    try_systemctl stop letmeinfwd.socket
-    try_systemctl stop letmeinfwd.service
-    try_systemctl disable letmeind.service
-    try_systemctl disable letmeind.socket
-    try_systemctl disable letmeinfwd.service
-    try_systemctl disable letmeinfwd.socket
-}
-
-start_services()
-{
-    do_systemctl start letmeinfwd.socket
-    do_systemctl start letmeinfwd.service
-    do_systemctl start letmeind.socket
-    do_systemctl start letmeind.service
-}
-
 entry_checks
 stop_services
 start_services

diff --git a/scripts/lib.sh b/scripts/lib.sh
@@ -0,0 +1,82 @@
+info()
+{
+    echo "--- $*"
+}
+
+error()
+{
+    echo "=== ERROR: $*" >&2
+}
+
+warning()
+{
+    echo "=== WARNING: $*" >&2
+}
+
+die()
+{
+    error "$*"
+    exit 1
+}
+
+do_install()
+{
+    info "install $*"
+    install "$@" || die "Failed install $*"
+}
+
+do_systemctl()
+{
+    info "systemctl $*"
+    systemctl "$@" || die "Failed to systemctl $*"
+}
+
+do_chown()
+{
+    info "chown $*"
+    chown "$@" || die "Failed to chown $*"
+}
+
+do_chmod()
+{
+    info "chmod $*"
+    chmod "$@" || die "Failed to chmod $*"
+}
+
+try_systemctl()
+{
+    info "systemctl $*"
+    systemctl "$@" 2>/dev/null
+}
+
+do_chown()
+{
+    info "chown $*"
+    chown "$@" || die "Failed to chown $*"
+}
+
+do_chmod()
+{
+    info "chmod $*"
+    chmod "$@" || die "Failed to chmod $*"
+}
+
+stop_services()
+{
+    try_systemctl stop letmeind.socket
+    try_systemctl stop letmeind.service
+    try_systemctl stop letmeinfwd.socket
+    try_systemctl stop letmeinfwd.service
+    try_systemctl disable letmeind.service
+    try_systemctl disable letmeind.socket
+    try_systemctl disable letmeinfwd.service
+    try_systemctl disable letmeinfwd.socket
+}
+
+start_services()
+{
+    do_systemctl start letmeinfwd.socket
+    do_systemctl start letmeinfwd.service
+    do_systemctl start letmeind.socket
+    do_systemctl start letmeind.service
+}
diff --git a/maintenance/makerelease.sh → scripts/makerelease.sh b/maintenance/makerelease.sh → scripts/makerelease.sh