diff options
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/control | 3 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rw-r--r-- | debian/source/format | 2 | ||||
| -rwxr-xr-x | systemctl | 23 |
5 files changed, 23 insertions, 14 deletions
diff --git a/debian/changelog b/debian/changelog index db21749..48a8dc2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +systemctl-service-shim (0.0.6) unstable; urgency=low + + * d/control: + - Drop D: moreutils ; no longer needed + - Rules-Requires-Root: no + + -- B. Stack <bgstack15@gmail.com> Mon, 18 Mar 2024 19:57:50 -0400 + systemctl-service-shim (0.0.5-1) unstable; urgency=low * Add usrmerge /usr/bin/systemctl control logic diff --git a/debian/control b/debian/control index 507765e..b410604 100644 --- a/debian/control +++ b/debian/control @@ -6,14 +6,13 @@ Build-Depends: debhelper-compat (= 12) Standards-Version: 4.5.0 Homepage: https://git.devuan.org/devuan/systemctl-service-shim Origin: Devuan -Vcs-Git: https://git.devuan.org/devuan/systemctl-service-shim.git +Vcs-Git: https://git.devuan.org/devuan/systemctl-service-shim.git -b suites/unstable Vcs-Browser: https://git.devuan.org/devuan/systemctl-service-shim Package: systemctl-service-shim Architecture: all Multi-Arch: foreign Depends: ${misc:Depends}, ${shlibs:Depends}, - moreutils, dash | bash (>= 4.0.0) Description: Adds systemctl translator script Use the included systemctl script which translates diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 4a97dfa..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -# You must remove unused comment lines for the released package. diff --git a/debian/source/format b/debian/source/format index 163aaf8..89ae9db 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -3.0 (quilt) +3.0 (native) @@ -4,33 +4,35 @@ # /usr/bin/hostnamectl # /usr/bin/systemd-detect-virt # Author: bgstack15@gmail.com +# Author: davidpaul@librem.one # Startdate: 2020-01-10 13:02:14 # SPDX-License-Identifier: CC-BY-SA-4.0 -# Title: -# Purpose: +# Title: +# Purpose: # Package: systemctl-service-shim -# History: +# History: # 2020-05-14 place framework.sh contents inline so as not to depend on it. # 2021-01-10 adapted for inclusion in devuan-sanity # 2021-10-20 add /bin/systemctl symlink control logic # 2022-07-12 Convert try-restart to restart # 2022-07-14 Add preset, which runs update-rc.d ${service} defaults # 2023-02-11 Add /usr/bin/systemctl symlink control -# Usage: +# 2024-03-08 Replace moreutils usage with POSIX shell +# Usage: # Should be mostly like systemctl from systemd. # Reference: ftemplate.sh 2019-05-02a ; framework.sh 2018-05-02a # man 1 systemctl # Improve: # Return 1 if status output is failed # Dependencies: -# req-devuan: moreutils +# req-devuan: # Documentation: # Be aware that real systemd systemctl is file /bin/systemctl but # this systemdtl is file /usr/sbin/systemctl to prevent a recursive loop # in some service scripts that look for /bin/systemctl # vim: set sw=3 sts=3 ts=3 et: fiversion="2019-05-02a" -systemctlversion="2023-02-11a" +systemctlversion="2024-03-18a" usage() { ${PAGER:-/usr/bin/less -F} >&2 <<ENDUSAGE @@ -233,12 +235,13 @@ setval() { } flecho() { - # requires moreutils - if echo "${@}" | grep -qiE '.' ; + date -u +[%Y-%m-%dT%TZ] | tr -d '\n' + printf "%s@%s" "${USER}" "${server}" + if echo "${@}" | grep -q '.' ; then - printf "%s\n" "${@}" | TZ=UTC ts "[%FT%TZ]${USER}@${server}:" + printf ":%s\n" "${@}" else - printf '' | TZ=UTC ts "[%FT%TZ]${USER}@${server}" + printf "\n" fi } |