[shepherd] 04/05: Rename 'dmd' command to 'shepherd'.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository shepherd.

commit c958bf7a2923a09a3dcd3dc5e833ce172f50377c
Author: Ludovic Courtès <address@hidden>
Date:   Mon Jan 11 22:43:05 2016 +0100

    Rename 'dmd' command to 'shepherd'.
    
    * modules/dmd.scm: Rename to...
    * modules/shepherd.scm: ... this.
    (program-name): Change to "shepherd".
    * configure.ac: Adjust accordingly.
    * dmd.in: Rename to...
    * shepherd.in: ... this.
    * tests/basic.sh, tests/no-home.sh, tests/respawn.sh,
    tests/sigint.sh, tests/status-sexp.sh: Invoke 'shepherd' instead of
    'dmd'.
    * Makefile.am (templates, bin_SCRIPTS): Adjust accordingly.
    (dist_shepherd_DATA): Likewise.
---
 Makefile.am                       |    8 ++++----
 configure.ac                      |    2 +-
 modules/{dmd.scm => shepherd.scm} |    6 +++---
 dmd.in => shepherd.in             |    2 +-
 tests/basic.sh                    |    4 ++--
 tests/no-home.sh                  |    4 ++--
 tests/respawn.sh                  |    4 ++--
 tests/sigint.sh                   |    4 ++--
 tests/status-sexp.sh              |    4 ++--
 9 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 0d6dcbc..68c98aa 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,10 +17,10 @@
 # along with the GNU Shepherd.  If not, see <http://www.gnu.org/licenses/>.
 
 # The main programs.
-bin_SCRIPTS = dmd deco
+bin_SCRIPTS = shepherd deco
 sbin_SCRIPTS = halt reboot
 templates =                                    \
-  dmd.in deco.in halt.in reboot.in             \
+  shepherd.in deco.in halt.in reboot.in                \
   modules/shepherd/config.scm.in               \
   modules/shepherd/system.scm.in
 
@@ -31,7 +31,7 @@ BUILT_SOURCES = modules/shepherd/config.scm
 shepherddir = ${datadir}/shepherd
 dist_shepherd_DATA =                           \
   modules/deco.scm                             \
-  modules/dmd.scm                              \
+  modules/shepherd.scm                         \
   modules/halt.scm                             \
   modules/reboot.scm
 nodist_shepherd_DATA = $(dist_shepherd_DATA:%.scm=%.go)
@@ -62,7 +62,7 @@ SUBDIRS = examples utils
 EXTRA_DIST = $(templates) QUESTIONS fdl-1.3.texi ChangeLog-2003
 
 # Create the socket directory (aka. 'default-socket-dir'.)  Make it
-# accessible only by its owner since otherwise 'dmd' suggests using
+# accessible only by its owner since otherwise 'shepherd' suggests using
 # '--insecure'.  This is just a convenience, so allow it to fail.
 install-data-local:
        -$(MKDIR_P) $(DESTDIR)$(localstatedir)/run/dmd
diff --git a/configure.ac b/configure.ac
index 878dc3f..7fe9cc7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ AC_PREREQ(2.69)
 
 dnl Initialization
 AC_INIT([GNU Shepherd], [0.3], address@hidden)
-AC_CONFIG_SRCDIR([modules/dmd.scm])
+AC_CONFIG_SRCDIR([modules/shepherd.scm])
 AC_CONFIG_AUX_DIR([build-aux])
 
 dnl We're fine with GNU make constructs, hence '-Wno-portability'.
diff --git a/modules/dmd.scm b/modules/shepherd.scm
similarity index 98%
rename from modules/dmd.scm
rename to modules/shepherd.scm
index c194b8a..a1b65d2 100644
--- a/modules/dmd.scm
+++ b/modules/shepherd.scm
@@ -1,4 +1,4 @@
-;; dmd.scm -- Daemon managing Daemons (or Daemons-managing Daemon?)
+;; shepherd.scm -- The daemon shepherd.
 ;; Copyright (C) 2013, 2014, 2016 Ludovic Courtès <address@hidden>
 ;; Copyright (C) 2002, 2003 Wolfgang Jährling <address@hidden>
 ;;
@@ -17,7 +17,7 @@
 ;; You should have received a copy of the GNU General Public License
 ;; along with the GNU Shepherd.  If not, see <http://www.gnu.org/licenses/>.
 
-(define-module (dmd)
+(define-module (shepherd)
   #:use-module (ice-9 match)
   #:use-module (ice-9 rdelim)   ;; Line-based I/O.
   #:autoload   (ice-9 readline) (activate-readline) ;for interactive use
@@ -34,7 +34,7 @@
   #:export (program-name
             main))
 
-(define program-name "dmd")
+(define program-name "shepherd")
 
 
 
diff --git a/dmd.in b/shepherd.in
similarity index 77%
rename from dmd.in
rename to shepherd.in
index 9e73602..e47d9fd 100644
--- a/dmd.in
+++ b/shepherd.in
@@ -4,4 +4,4 @@
 
 (set! %load-path (cons "%modsrcdir%" %load-path))
 (set! %load-compiled-path (cons "%modbuilddir%" %load-compiled-path))
-(apply (@ (dmd) main) (cdr (command-line)))
+(apply (@ (shepherd) main) (cdr (command-line)))
diff --git a/tests/basic.sh b/tests/basic.sh
index f72198c..d91bb06 100644
--- a/tests/basic.sh
+++ b/tests/basic.sh
@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with the GNU Shepherd.  If not, see <http://www.gnu.org/licenses/>.
 
-dmd --version
+shepherd --version
 deco --version
 
 socket="t-socket-$$"
@@ -56,7 +56,7 @@ cat > "$conf"<<EOF
 EOF
 
 rm -f "$pid"
-dmd -I -s "$socket" -c "$conf" -l "$log" --pid="$pid" &
+shepherd -I -s "$socket" -c "$conf" -l "$log" --pid="$pid" &
 
 # Wait till it's ready.
 while ! test -f "$pid" ; do : ; done
diff --git a/tests/no-home.sh b/tests/no-home.sh
index 7fb8bea..06a757e 100644
--- a/tests/no-home.sh
+++ b/tests/no-home.sh
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with the GNU Shepherd.  If not, see <http://www.gnu.org/licenses/>.
 
-dmd --version
+shepherd --version
 
 HOME=/nowhere
 export HOME
@@ -36,7 +36,7 @@ trap "rm -f $socket $pid;
       test -f $pid && kill \`cat $pid\` || true" EXIT
 
 # Make sure 'dmd' starts even though $HOME is not writable.
-dmd -I -s "$socket" -c /dev/null -l /dev/null --pid="$pid" &
+shepherd -I -s "$socket" -c /dev/null -l /dev/null --pid="$pid" &
 dmd_pid="$!"
 
 # Wait until it's ready, or until it terminates.
diff --git a/tests/respawn.sh b/tests/respawn.sh
index 04f562f..afffaf3 100644
--- a/tests/respawn.sh
+++ b/tests/respawn.sh
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with the GNU Shepherd.  If not, see <http://www.gnu.org/licenses/>.
 
-dmd --version
+shepherd --version
 deco --version
 
 socket="t-socket-$$"
@@ -82,7 +82,7 @@ cat > "$conf"<<EOF
 EOF
 
 rm -f "$pid"
-dmd -I -s "$socket" -c "$conf" -l "$log" --pid="$pid" &
+shepherd -I -s "$socket" -c "$conf" -l "$log" --pid="$pid" &
 
 # Wait till it's ready.
 wait_for_file "$pid"
diff --git a/tests/sigint.sh b/tests/sigint.sh
index bb149a7..ebf8f3d 100644
--- a/tests/sigint.sh
+++ b/tests/sigint.sh
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with the GNU Shepherd.  If not, see <http://www.gnu.org/licenses/>.
 
-dmd --version
+shepherd --version
 deco --version
 
 socket="t-socket-$$"
@@ -44,7 +44,7 @@ cat > "$conf"<<EOF
 EOF
 
 rm -f "$pid" "$stamp"
-dmd -I -s "$socket" -c "$conf" --pid="$pid" &
+shepherd -I -s "$socket" -c "$conf" --pid="$pid" &
 
 while [ ! -f "$pid" ] ; do sleep 0.5 ; done
 
diff --git a/tests/status-sexp.sh b/tests/status-sexp.sh
index a436e0a..17f086f 100644
--- a/tests/status-sexp.sh
+++ b/tests/status-sexp.sh
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with the GNU Shepherd.  If not, see <http://www.gnu.org/licenses/>.
 
-dmd --version
+shepherd --version
 deco --version
 
 socket="t-socket-$$"
@@ -49,7 +49,7 @@ cat > "$conf"<<EOF
 EOF
 
 rm -f "$pid"
-dmd -I -s "$socket" -c "$conf" -l "$log" --pid="$pid" &
+shepherd -I -s "$socket" -c "$conf" -l "$log" --pid="$pid" &
 
 # Wait till it's ready.
 while ! test -f "$pid" ; do : ; done