v0.0.3 closes #688upstream/0.0.3

7 files changed, 25 insertions, 9 deletions

diff --git a/NEWS b/NEWS
index d4cc743..5af6572 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+systemctl-service-shim 0.0.3
+===========================
+2022-07-12
+* Package now provides the /bin/systemctl symlink needed by freeipa-client.
+* Action `try-restart` is now converted down to `restart`.
+
 systemctl-service-shim 0.0.2
 ============================
 2021-10-20
diff --git a/debian/changelog b/debian/changelog
index cb950d0..c19065f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+systemctl-service-shim (0.0.3-1) unstable; urgency=low
+
+  * Add /bin/systemctl symlink directly to package (Closes: #688)
+  * Action `try-restart` is simplified to `restart`
+
+ -- B. Stack <bgstack15@gmail.com>  Tue, 12 Jul 2022 10:52:37 -0400
+
 systemctl-service-shim (0.0.2-1) unstable; urgency=low
 
   * Add /bin/systemctl symlink control logic
diff --git a/debian/systemctl-service-shim.links b/debian/systemctl-service-shim.links
index 9a784ad..d8b2244 100644
--- a/debian/systemctl-service-shim.links
+++ b/debian/systemctl-service-shim.links
@@ -1,2 +1,3 @@
 /usr/sbin/systemctl /usr/bin/hostnamectl
 /usr/sbin/systemctl /usr/bin/systemd-detect-virt
+/usr/sbin/systemctl /bin/systemctl
diff --git a/debian/systemctl-service-shim.lintian-overrides b/debian/systemctl-service-shim.lintian-overrides
index 6ec70aa..580ebe0 100644
--- a/debian/systemctl-service-shim.lintian-overrides
+++ b/debian/systemctl-service-shim.lintian-overrides
@@ -1,2 +1,3 @@
 no-manual-page usr/bin/hostnamectl
 no-manual-page usr/bin/systemd-detect-virt
+no-manual-page bin/systemctl
diff --git a/systemctl b/systemctl
index 23e799c..5d1d578 100755
--- a/systemctl
+++ b/systemctl
@@ -13,6 +13,7 @@
 #    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
 # Usage: 
 #    Should be mostly like systemctl from systemd.
 # Reference: ftemplate.sh 2019-05-02a ; framework.sh 2018-05-02a
@@ -28,7 +29,7 @@
 #    in some service scripts that look for /bin/systemctl
 # vim: set sw=3 sts=3 ts=3 et:
 fiversion="2019-05-02a"
-systemctlversion="2021-10-20a"
+systemctlversion="2022-07-12a"
 
 usage() {
    ${PAGER:-/usr/bin/less -F} >&2 <<ENDUSAGE
@@ -409,7 +410,7 @@ case "${action}" in
    restart|start|stop|status|reload|condrestart|try-restart|reload-or-try-restart)
       # re-map a few actions
       case "${action}" in
-         "reload-or-try-restart") action=restart ;;
+         "reload-or-try-restart"|try-restart) action=restart ;;
       esac
       x=1
       while test ${x:-${thiscount}} -le $(( thiscount - 1 )) && test ${thiscount} -gt 1 ;
diff --git a/systemctl.8 b/systemctl.8
index 478a691..8d61366 100644
--- a/systemctl.8
+++ b/systemctl.8
@@ -1,5 +1,5 @@
 .\" Generated with txt2man-wrapper in bgscripts, and hand-fixed.
-.TH systemctl 8 "January 2021" "devuan-sanity" "Devuan Commands Manual"
+.TH systemctl 8 "July 2022" "systemctl-service-shim" "Devuan Commands Manual"
 .SH NAME
 \fBsystemctl \fP- Translate systemctl invocations into real service commands
 .SH SYNOPSIS
@@ -13,7 +13,7 @@
 .SH DESCRIPTION
 Transform and execute every \fBsystemctl\fP invocation into a single or multiple service and update-rc.d commands. This script attemps to replace \fBsystemctl\fP \fBfrom\fP the \fBsystemd\fP project, for applications that are hardcoded errantly to use \fBsystemctl\fP instead of real service control operations.
 .PP
-The goal is to convert all possible \fBsystemctl\fP tasks to real service commands.
+The goal is to convert all possible \fBsystemctl\fP tasks to real service commands. Some of these, like \fBtry-restart\fP are merely converted down to \fBrestart\fP.
 .PP
 The script will log all invocations to /var/log/systemctl.log to assist in troubleshooting.
 .SH AUTHOR
@@ -21,6 +21,6 @@ B. Stack <bgstack15@gmail.com>
 .SH COPYRIGHT  
 CC-BY-SA 4.0
 .SH BUGS
-Of course no software is ever perfect. Please report bugs to bgstack15 on the #devuan-dev irc channel on freenode.net, or at <bgstack15@gmail.com>
+Of course no software is ever perfect. Please report bugs to bgstack15 on the #devuan-dev irc channel on libera.chat, or at <bgstack15@gmail.com>
 .SH SEE ALSO
 `\fBsystemctl\fP(1) \fBfrom\fP \fBsystemd\fP`
diff --git a/systemctl.txt b/systemctl.txt
index 57ead59..6e07283 100644
--- a/systemctl.txt
+++ b/systemctl.txt
@@ -1,8 +1,8 @@
 title systemctl
 section 8
-project devuan-sanity
+project systemctl-service-shim
 volume Devuan Commands Manual
-date January 2021
+date July 2022
 =====
 NAME
   systemctl - Translate systemctl invocations into real service commands
@@ -11,7 +11,7 @@ SYNOPSIS
 DESCRIPTION
   Transform and execute every systemctl invocation into a single or multiple service and update-rc.d commands. This script attemps to replace systemctl from the systemd project, for applications that are hardcoded errantly to use systemctl instead of real service control operations.
 
-  The goal is to convert all possible systemctl tasks to real service commands.
+  The goal is to convert all possible systemctl tasks to real service commands. Some of these, like `try-restart` are merely converted down to `restart`.
 
   The script will log all invocations to /var/log/systemctl.log to assist in troubleshooting.
 AUTHOR
@@ -19,6 +19,6 @@ AUTHOR
 COPYRIGHT  
   CC-BY-SA 4.0
 BUGS
-  Of course no software is ever perfect. Please report bugs to bgstack15 on the #devuan-dev irc channel on freenode.net, or at <bgstack15@gmail.com>
+  Of course no software is ever perfect. Please report bugs to bgstack15 on the #devuan-dev irc channel on libera.chat, or at <bgstack15@gmail.com>
 SEE ALSO
   `systemctl(1) from systemd`