[SHEPHERD] [PATCH 0/8]: More dmd -> shepherd patches.

[SHEPHERD] [PATCH 0/8]: More dmd -> shepherd patches.

[Alex Kost]

Hello, this is another patchset for moving away from "dmd" name.

AFAICT the only files where deco/dmd still present (except NEWS and
ANNOUNCE--*) are: THANKS, QUESTIONS and "examples" directory.  I don't
know whether these files should be modified or not.

Patches:

[PATCH 1/8] tests: misbehaved-client: Rename 'dmd' to 'root'.

  I hope this is the last followup to cddf6a5 :-)

  However, the strange thing is that this test don't fail when 'dmd' (or
  any other name) is used.  I didn't closely look at this test, so I'm
  just blaming.

[PATCH 2/8] tests: Rename 'dmd_pid' to 'shepherd_pid'.
[PATCH 3/8] ChangeLog: Rename git repository.
[PATCH 4/8] support: Rename 'make-dmd-user-module' to 'make-user-module'.
[PATCH 5/8] Rename default system configuration file.
[PATCH 6/8] support: Rename state file.
[PATCH 7/8] utils: Rename 'dmd-gettext.scm' to 'shepherd-gettext.scm'.

  I don't really understand the purpose of this file, I just renamed it.

[PATCH 8/8] Replace "dmd" with "shepherd" in comments and strings.

  This is the final cleanup.

[PATCH 1/8] tests: misbehaved-client: Rename 'dmd' to 'root'.

[Alex Kost]

This is a followup to commit cddf6a5aed5c66f91b93a84afa4b5dadde743b13.

* tests/misbehaved-client.sh: Use 'root' service name instead of 'dmd'.
---
 tests/misbehaved-client.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/misbehaved-client.sh b/tests/misbehaved-client.sh
index 4c21cab..fad5f4d 100644
--- a/tests/misbehaved-client.sh
+++ b/tests/misbehaved-client.sh
@@ -69,7 +69,7 @@ $herd status			# still here?
 
 (let ((sock (open-connection \"$socket\")))
   (setvbuf sock _IOFBF 5000)
-  (write-command (shepherd-command 'status 'dmd) sock)
+  (write-command (shepherd-command 'status 'root) sock)
 
   ;; Close prematurely, right after sending the command.
   (close-port sock))"
-- 
2.6.3

Re: [PATCH 1/8] tests: misbehaved-client: Rename 'dmd' to 'root'.

[Ludovic Courtès]

Alex Kost <alezost@gmail.com> skribis:

> This is a followup to commit cddf6a5aed5c66f91b93a84afa4b5dadde743b13.
>
> * tests/misbehaved-client.sh: Use 'root' service name instead of 'dmd'.

OK!

[PATCH 2/8] tests: Rename 'dmd_pid' to 'shepherd_pid'.

[Alex Kost]

* tests/basic.sh: Rename 'dmd_pid' to 'shepherd_pid'.
* tests/misbehaved-client.sh: Likewise.
* tests/no-home.sh: Likewise.
* tests/respawn.sh: Likewise.
* tests/status-sexp.sh: Likewise.
---
 tests/basic.sh             | 10 +++++-----
 tests/misbehaved-client.sh |  2 +-
 tests/no-home.sh           |  4 ++--
 tests/respawn.sh           |  4 ++--
 tests/status-sexp.sh       |  6 +++---
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/tests/basic.sh b/tests/basic.sh
index a20e9dc..e2142c8 100644
--- a/tests/basic.sh
+++ b/tests/basic.sh
@@ -63,9 +63,9 @@ shepherd -I -s "$socket" -c "$conf" -l "$log" --pid="$pid" &
 # Wait till it's ready.
 while ! test -f "$pid" ; do sleep 0.3 ; done
 
-dmd_pid="`cat $pid`"
+shepherd_pid="`cat $pid`"
 
-kill -0 $dmd_pid
+kill -0 $shepherd_pid
 test -S "$socket"
 pristine_status=`$herd status root` # Prep for 'reload' test.
 echo $pristine_status | grep -E '(Start.*root|Stop.*test)'
@@ -126,7 +126,7 @@ $herd status | grep "Stopped: ()"
 $herd status | grep "Started: (root)"
 
 $herd stop root
-! kill -0 $dmd_pid
+! kill -0 $shepherd_pid
 
 test -f "$log"
 
@@ -152,9 +152,9 @@ $herd status test | grep started
 $herd stop test
 ! test -f "$stamp"
 
-dmd_pid="`cat $pid`"
+shepherd_pid="`cat $pid`"
 
 $herd stop root
-! kill -0 $dmd_pid
+! kill -0 $shepherd_pid
 
 rm -rf $confdir
diff --git a/tests/misbehaved-client.sh b/tests/misbehaved-client.sh
index fad5f4d..edacc45 100644
--- a/tests/misbehaved-client.sh
+++ b/tests/misbehaved-client.sh
@@ -35,7 +35,7 @@ shepherd -I -s "$socket" -c /dev/null -l "$log" --pid="$pid" &
 # Wait till it's ready.
 while ! test -f "$pid" ; do sleep 0.3 ; done
 
-dmd_pid="`cat $pid`"
+shepherd_pid="`cat $pid`"
 
 "$GUILE" -c "
 (use-modules (shepherd comm))
diff --git a/tests/no-home.sh b/tests/no-home.sh
index 5af51e6..32fa842 100644
--- a/tests/no-home.sh
+++ b/tests/no-home.sh
@@ -37,10 +37,10 @@ trap "rm -f $socket;
 
 # Make sure 'dmd' starts even though $HOME is not writable.
 shepherd -I -s "$socket" -c /dev/null -l /dev/null --pid="$pid" &
-dmd_pid="$!"
+shepherd_pid="$!"
 
 # Wait until it's ready, or until it terminates.
-while ! test -f "$pid" ; do kill -0 "$dmd_pid" ; sleep 0.3 ; done
+while ! test -f "$pid" ; do kill -0 "$shepherd_pid" ; sleep 0.3 ; done
 
 kill -0 `cat "$pid"`
 $herd status root
diff --git a/tests/respawn.sh b/tests/respawn.sh
index 32d18db..ebc298d 100644
--- a/tests/respawn.sh
+++ b/tests/respawn.sh
@@ -90,9 +90,9 @@ shepherd -I -s "$socket" -c "$conf" -l "$log" --pid="$pid" &
 # Wait till it's ready.
 wait_for_file "$pid"
 
-dmd_pid="`cat $pid`"
+shepherd_pid="`cat $pid`"
 
-kill -0 $dmd_pid
+kill -0 $shepherd_pid
 test -S "$socket"
 $herd status
 $herd status test1 | grep started
diff --git a/tests/status-sexp.sh b/tests/status-sexp.sh
index 3452a15..0f1417c 100644
--- a/tests/status-sexp.sh
+++ b/tests/status-sexp.sh
@@ -54,9 +54,9 @@ shepherd -I -s "$socket" -c "$conf" -l "$log" --pid="$pid" &
 # Wait till it's ready.
 while ! test -f "$pid" ; do sleep 0.3 ; done
 
-dmd_pid="`cat $pid`"
+shepherd_pid="`cat $pid`"
 
-kill -0 $dmd_pid
+kill -0 $shepherd_pid
 test -S "$socket"
 
 # Code to fetch service status info.
@@ -123,6 +123,6 @@ $herd unload root all
             (error #f) (messages ()))))"
 
 $herd stop root
-! kill -0 $dmd_pid
+! kill -0 $shepherd_pid
 
 test -f "$log"
-- 
2.6.3

Re: [PATCH 2/8] tests: Rename 'dmd_pid' to 'shepherd_pid'.

[Ludovic Courtès]

Alex Kost <alezost@gmail.com> skribis:

> * tests/basic.sh: Rename 'dmd_pid' to 'shepherd_pid'.
> * tests/misbehaved-client.sh: Likewise.
> * tests/no-home.sh: Likewise.
> * tests/respawn.sh: Likewise.
> * tests/status-sexp.sh: Likewise.

OK!

[PATCH 3/8] ChangeLog: Rename git repository.

[Alex Kost]

* ChangeLog: Use shepherd source.
---
 ChangeLog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 00c3b92..bddfc54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
 Normally a ChangeLog is generated at "make dist" time and available in
 source tarballs.
 
-If not, see the Git commit log at <http://git.sv.gnu.org/cgit/dmd.git/>.
+If not, see the Git commit log at <http://git.sv.gnu.org/cgit/shepherd.git>.
-- 
2.6.3

Re: [PATCH 3/8] ChangeLog: Rename git repository.

[Ludovic Courtès]

Alex Kost <alezost@gmail.com> skribis:

> * ChangeLog: Use shepherd source.

OK.

[PATCH 4/8] support: Rename 'make-dmd-user-module' to 'make-user-module'.

[Alex Kost]

* modules/shepherd/support.scm (make-dmd-user-module): Rename to...
(make-user-module): ... this.
(load-in-user-module): Adjust accordingly.
---
 modules/shepherd/support.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/shepherd/support.scm b/modules/shepherd/support.scm
index 9bfb050..562a87b 100644
--- a/modules/shepherd/support.scm
+++ b/modules/shepherd/support.scm
@@ -303,7 +303,7 @@ create a template configuration file if non exists."
 (define persistency #f)
 (define persistency-state-file default-persistency-state-file)
 
-(define (make-dmd-user-module)
+(define (make-user-module)
   "Return a new module, for use when evaluating the user's configuration,
 which has essential bindings pulled in."
   (let ((m (make-fresh-user-module)))
@@ -315,7 +315,7 @@ which has essential bindings pulled in."
 
 (define (load-in-user-module file)
   "Load FILE in a fresh user module that has essential bindings pulled in."
-  (let ((user-module (make-dmd-user-module)))
+  (let ((user-module (make-user-module)))
     (save-module-excursion
      (lambda ()
        (set-current-module user-module)
-- 
2.6.3

Re: [PATCH 4/8] support: Rename 'make-dmd-user-module' to 'make-user-module'.

[Ludovic Courtès]

Alex Kost <alezost@gmail.com> skribis:

> * modules/shepherd/support.scm (make-dmd-user-module): Rename to...
> (make-user-module): ... this.
> (load-in-user-module): Adjust accordingly.

OK.

[PATCH 5/8] Rename default system configuration file.

[Alex Kost]

* modules/shepherd/support.scm (default-config-file): Rename
  "dmdconf.scm" to "shepherd.conf.scm".
* shepherd.texi (Jump Start): Likewise.
---
 modules/shepherd/support.scm | 2 +-
 shepherd.texi                | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/shepherd/support.scm b/modules/shepherd/support.scm
index 562a87b..f161056 100644
--- a/modules/shepherd/support.scm
+++ b/modules/shepherd/support.scm
@@ -268,7 +268,7 @@ TARGET should be a string representing a filepath + name."
 global system configuration file when running as 'root'.  As a side effect,
 create a template configuration file if non exists."
   (if (zero? (getuid))
-      (string-append %sysconfdir "/dmdconf.scm")
+      (string-append %sysconfdir "/shepherd.conf.scm")
       (let ((config-file (string-append %user-config-dir "/init.scm")))
         (mkdir-p %user-config-dir #o700)
         (if (not (file-exists? config-file))
diff --git a/shepherd.texi b/shepherd.texi
index 74cf584..29fbe02 100644
--- a/shepherd.texi
+++ b/shepherd.texi
@@ -141,7 +141,7 @@ mentioned below.
 @cindex Configuration file
 When @command{shepherd} gets started, it reads and evaluates a
 configuration file.  When it is started with superuser priviledges, it
-tries to use @code{/etc/dmdconf.scm}.  When started as normal user, it
+tries to use @code{/etc/shepherd.conf.scm}.  When started as normal user, it
 looks for a file called @code{$XDG_CONFIG_HOME/shepherd/init.scm}.  If
 the @code{XDG_CONFIG_HOME} environment variable is not defined,
 @code{$HOME/.config/shepherd/init.scm} is used instead.  With the option
@@ -150,8 +150,8 @@ look instead.  So if you want to start @command{shepherd} with an
 alternative file, use one of the following commands:
 
 @example
-shepherd --config=/etc/dmdconf.scm.old
-shepherd -c /etc/dmdconf.scm.old
+shepherd --config=/etc/shepherd.conf.scm.old
+shepherd -c /etc/shepherd.conf.scm.old
 @end example
 
 @cindex Starting a service
-- 
2.6.3

Re: [PATCH 5/8] Rename default system configuration file.

[Ludovic Courtès]

Alex Kost <alezost@gmail.com> skribis:

> * modules/shepherd/support.scm (default-config-file): Rename
>   "dmdconf.scm" to "shepherd.conf.scm".
> * shepherd.texi (Jump Start): Likewise.

OK!

[PATCH 6/8] support: Rename state file.

[Alex Kost]

* modules/shepherd/support.scm (default-persistency-state-file): Use
  "shepherd" instead of "dmd".
---
 modules/shepherd/support.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/shepherd/support.scm b/modules/shepherd/support.scm
index f161056..aae8b3c 100644
--- a/modules/shepherd/support.scm
+++ b/modules/shepherd/support.scm
@@ -296,8 +296,8 @@ create a template configuration file if non exists."
 ;; Saving the state on exit.
 (define default-persistency-state-file
   (if (zero? (getuid))
-      (string-append %localstatedir "/lib/misc/dmd-state")
-      (string-append %user-config-dir "/dmd-state")))
+      (string-append %localstatedir "/lib/shepherd/state")
+      (string-append %user-config-dir "/state")))
 
 ;; Global variables set from (dmd).
 (define persistency #f)
-- 
2.6.3

Re: [PATCH 6/8] support: Rename state file.

[Ludovic Courtès]

Alex Kost <alezost@gmail.com> skribis:

> * modules/shepherd/support.scm (default-persistency-state-file): Use
>   "shepherd" instead of "dmd".

[..]

> diff --git a/modules/shepherd/support.scm b/modules/shepherd/support.scm
> index f161056..aae8b3c 100644
> --- a/modules/shepherd/support.scm
> +++ b/modules/shepherd/support.scm
> @@ -296,8 +296,8 @@ create a template configuration file if non exists."
>  ;; Saving the state on exit.
>  (define default-persistency-state-file
>    (if (zero? (getuid))
> -      (string-append %localstatedir "/lib/misc/dmd-state")
> -      (string-append %user-config-dir "/dmd-state")))
> +      (string-append %localstatedir "/lib/shepherd/state")
> +      (string-append %user-config-dir "/state")))

OK!

Eventually, in the non-root case, we should have a %user-state-dir
following the XDG specs to store this file.

Ludo’.

Re: [PATCH 6/8] support: Rename state file.

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 1293 bytes --]

On Mon, 25 Jan 2016 13:50:19 +0300
Alex Kost <alezost@gmail.com> wrote:

> * modules/shepherd/support.scm (default-persistency-state-file): Use
>   "shepherd" instead of "dmd".
> ---
>  modules/shepherd/support.scm | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/modules/shepherd/support.scm b/modules/shepherd/support.scm
> index f161056..aae8b3c 100644
> --- a/modules/shepherd/support.scm
> +++ b/modules/shepherd/support.scm
> @@ -296,8 +296,8 @@ create a template configuration file if non exists."
>  ;; Saving the state on exit.
>  (define default-persistency-state-file
>    (if (zero? (getuid))
> -      (string-append %localstatedir "/lib/misc/dmd-state")
> -      (string-append %user-config-dir "/dmd-state")))
> +      (string-append %localstatedir "/lib/shepherd/state")
> +      (string-append %user-config-dir "/state")))
>  
>  ;; Global variables set from (dmd).
>  (define persistency #f)
                                  ^
----------------------------------|

it's a comment, but it's still for dmd


-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH 6/8] support: Rename state file.

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 552 bytes --]

On Mon, 25 Jan 2016 21:26:47 +0200
Efraim Flashner <efraim@flashner.co.il> wrote:

> On Mon, 25 Jan 2016 13:50:19 +0300
> Alex Kost <alezost@gmail.com> wrote:
> 
>  [...]  
>                                   ^
> ----------------------------------|
> 
> it's a comment, but it's still for dmd
> 

nevermind, just saw patch 8

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

[PATCH 7/8] utils: Rename 'dmd-gettext.scm' to 'shepherd-gettext.scm'.

[Alex Kost]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=UTF-8, Size: 5068 bytes --]

* utils/dmd-gettext.scm: Rename to...
* utils/shepherd-gettext.scm: ... this.
* utils/Makefile.am (EXTRA_DIST): Use it.
---
 utils/Makefile.am          |  2 +-
 utils/dmd-gettext.scm      | 61 ----------------------------------------------
 utils/shepherd-gettext.scm | 61 ++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 62 insertions(+), 62 deletions(-)
 delete mode 100644 utils/dmd-gettext.scm
 create mode 100644 utils/shepherd-gettext.scm

diff --git a/utils/Makefile.am b/utils/Makefile.am
index 4e8179d..5d13ff0 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -1,3 +1,3 @@
 # utils/Makefile.am -- Utility programs.
 
-EXTRA_DIST = dmd-gettext.scm sysvconfig.scm
+EXTRA_DIST = shepherd-gettext.scm sysvconfig.scm
diff --git a/utils/dmd-gettext.scm b/utils/dmd-gettext.scm
deleted file mode 100644
index 72d6441..0000000
--- a/utils/dmd-gettext.scm
+++ /dev/null
@@ -1,61 +0,0 @@
-;; dmd-gettext.scm -- Extract translatable strings from source code.
-;; Copyright (C) 2002 Wolfgang Jährling <wolfgang@pro-linux.de>
-;;
-;; This file is part of the GNU Shepherd.
-;;
-;; The GNU Shepherd is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3 of the License, or (at
-;; your option) any later version.
-;;
-;; The GNU Shepherd is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-;;
-;; 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 l10n-keywords '(l10n local-output))
-
-(define (puts . text)
-  (for-each display text)
-  (newline))
-
-(define (found-string str orig)
-  (puts "#: " (source-property orig 'filename)
-	":" (source-property orig 'line))
-  (puts "msgid \"" str "\"")
-  (puts "msgstr \"\"")
-  (puts))
-
-(define (extract-strings port)
-  (letrec ((next-expr
-	    (lambda (data)
-	      (or (eof-object? data)
-		  (begin
-		    (letrec ((look-at
-			      (lambda (expr)
-				(if (and (list? expr)
-					 (not (null? expr)))
-				    (begin
-				      (and (memq (car expr)
-						 l10n-keywords)
-					   (found-string (cadr expr) expr))
-				      (for-each look-at expr))
-				    (and (pair? expr)
-					 (begin
-					   (look-at (car expr))
-					   (look-at (cdr expr))))))))
-		      (look-at data))
-		    (next-expr (read port)))))))
-    (next-expr (read port))))
-
-;; Safe file positions of the expressions we read.  It is enabled by
-;; default, but we want to be sure.
-(read-enable 'positions)
-
-;; Iterate over all given files.
-(for-each extract-strings
-	  (map open-input-file
-	       (cdr (command-line))))
diff --git a/utils/shepherd-gettext.scm b/utils/shepherd-gettext.scm
new file mode 100644
index 0000000..35edacf
--- /dev/null
+++ b/utils/shepherd-gettext.scm
@@ -0,0 +1,61 @@
+;; shepherd-gettext.scm -- Extract translatable strings from source code.
+;; Copyright (C) 2002 Wolfgang Jährling <wolfgang@pro-linux.de>
+;;
+;; This file is part of the GNU Shepherd.
+;;
+;; The GNU Shepherd is free software; you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 3 of the License, or (at
+;; your option) any later version.
+;;
+;; The GNU Shepherd is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;;
+;; 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 l10n-keywords '(l10n local-output))
+
+(define (puts . text)
+  (for-each display text)
+  (newline))
+
+(define (found-string str orig)
+  (puts "#: " (source-property orig 'filename)
+	":" (source-property orig 'line))
+  (puts "msgid \"" str "\"")
+  (puts "msgstr \"\"")
+  (puts))
+
+(define (extract-strings port)
+  (letrec ((next-expr
+	    (lambda (data)
+	      (or (eof-object? data)
+		  (begin
+		    (letrec ((look-at
+			      (lambda (expr)
+				(if (and (list? expr)
+					 (not (null? expr)))
+				    (begin
+				      (and (memq (car expr)
+						 l10n-keywords)
+					   (found-string (cadr expr) expr))
+				      (for-each look-at expr))
+				    (and (pair? expr)
+					 (begin
+					   (look-at (car expr))
+					   (look-at (cdr expr))))))))
+		      (look-at data))
+		    (next-expr (read port)))))))
+    (next-expr (read port))))
+
+;; Safe file positions of the expressions we read.  It is enabled by
+;; default, but we want to be sure.
+(read-enable 'positions)
+
+;; Iterate over all given files.
+(for-each extract-strings
+	  (map open-input-file
+	       (cdr (command-line))))
-- 
2.6.3

Re: [PATCH 7/8] utils: Rename 'dmd-gettext.scm' to 'shepherd-gettext.scm'.

[Ludovic Courtès]

Alex Kost <alezost@gmail.com> skribis:

> * utils/dmd-gettext.scm: Rename to...
> * utils/shepherd-gettext.scm: ... this.
> * utils/Makefile.am (EXTRA_DIST): Use it.

Actually let’s remove it instead.  When we add i18n support, we’ll use
xgettext, which knows how to extract strings from Scheme code nowadays
(which probably wasn’t the case back then.)

Ludo’.

Re: [PATCH 7/8] utils: Rename 'dmd-gettext.scm' to 'shepherd-gettext.scm'.

[Alex Kost]

Ludovic Courtès (2016-01-25 18:12 +0300) wrote:

> Alex Kost <alezost@gmail.com> skribis:
>
>> * utils/dmd-gettext.scm: Rename to...
>> * utils/shepherd-gettext.scm: ... this.
>> * utils/Makefile.am (EXTRA_DIST): Use it.
>
> Actually let’s remove it instead.  When we add i18n support, we’ll use
> xgettext, which knows how to extract strings from Scheme code nowadays
> (which probably wasn’t the case back then.)

What about removing the whole "utils" directory?

-- 
Alex

Re: [PATCH 7/8] utils: Rename 'dmd-gettext.scm' to 'shepherd-gettext.scm'.

[Ludovic Courtès]

Alex Kost <alezost@gmail.com> skribis:

> Ludovic Courtès (2016-01-25 18:12 +0300) wrote:
>
>> Alex Kost <alezost@gmail.com> skribis:
>>
>>> * utils/dmd-gettext.scm: Rename to...
>>> * utils/shepherd-gettext.scm: ... this.
>>> * utils/Makefile.am (EXTRA_DIST): Use it.
>>
>> Actually let’s remove it instead.  When we add i18n support, we’ll use
>> xgettext, which knows how to extract strings from Scheme code nowadays
>> (which probably wasn’t the case back then.)
>
> What about removing the whole "utils" directory?

Good idea, go ahead!

Ludo’.

Re: [PATCH 7/8] utils: Rename 'dmd-gettext.scm' to 'shepherd-gettext.scm'.

[Alex Kost]

Ludovic Courtès (2016-01-26 00:51 +0300) wrote:

> Alex Kost <alezost@gmail.com> skribis:
>
>> Ludovic Courtès (2016-01-25 18:12 +0300) wrote:
>>
>>> Alex Kost <alezost@gmail.com> skribis:
>>>
>>>> * utils/dmd-gettext.scm: Rename to...
>>>> * utils/shepherd-gettext.scm: ... this.
>>>> * utils/Makefile.am (EXTRA_DIST): Use it.
>>>
>>> Actually let’s remove it instead.  When we add i18n support, we’ll use
>>> xgettext, which knows how to extract strings from Scheme code nowadays
>>> (which probably wasn’t the case back then.)
>>
>> What about removing the whole "utils" directory?
>
> Good idea, go ahead!

Done.

-- 
Alex

[PATCH 8/8] Replace "dmd" with "shepherd" in comments and strings.

[Alex Kost]

* modules/shepherd/support.scm: Use "shepherd" instead of "dmd"
  everywhere.
* configure.ac: Likewise.
* tests/no-home.sh: Likewise.
* tests/sigint.sh: Likewise.
---
 configure.ac                 |  2 +-
 modules/shepherd/support.scm | 16 ++++++++--------
 tests/no-home.sh             |  2 +-
 tests/sigint.sh              |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/configure.ac b/configure.ac
index f89604c..478994c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,7 +34,7 @@ else
 fi
 AC_MSG_RESULT($recent_version)
 if test $recent_version = no; then
-  AC_MSG_WARN(your Guile is probably too old to run dmd)
+  AC_MSG_WARN(your Guile is probably too old to run shepherd)
 fi
 
 AC_PATH_PROG([GUILD], [guild])
diff --git a/modules/shepherd/support.scm b/modules/shepherd/support.scm
index aae8b3c..cd478ba 100644
--- a/modules/shepherd/support.scm
+++ b/modules/shepherd/support.scm
@@ -1,4 +1,4 @@
-;; support.scm -- Various support facilities, used by herd and dmd.
+;; support.scm -- Various support facilities, used by herd and shepherd.
 ;; Copyright (C) 2014 A.Sassmannshausen <alex.sassmannshausen@gmail.com>
 ;; Copyright (C) 2013, 2014, 2016 Ludovic Courtès <ludo@gnu.org>
 ;; Copyright (C) 2002, 2003 Wolfgang Jährling <wolfgang@pro-linux.de>
@@ -219,7 +219,7 @@ There is NO WARRANTY, to the extent permitted by law.")))
 ;; Home directory of the user.
 (define user-homedir
   ;; Look for $HOME first, to allow users to override the defaults.  This is
-  ;; notably useful when dmd is built in a Guix chroot.
+  ;; notably useful when shepherd is built in a Guix chroot.
   (or (getenv "HOME")
 
       ;; When bootstrapping and running as PID 1, /etc/{passwd,shadow} may be
@@ -240,17 +240,17 @@ TARGET should be a string representing a filepath + name."
   (with-output-to-file target
     (lambda ()
       (display (string-append
-                ";; init.scm -- default dmd configuration file.
+                ";; init.scm -- default shepherd configuration file.
 
-;; Services known to dmd:
-;; Add new services (defined using 'make <service>') to dmd here by
+;; Services known to shepherd:
+;; Add new services (defined using 'make <service>') to shepherd here by
 ;; providing them as arguments to 'register-services'.
 ""(register-services)
 
 ;; Send shepherd into the background
 ""(action 'shepherd 'daemonize)
 
-;; Services to start when dmd starts:
+;; Services to start when shepherd starts:
 ;; Add the name of each service that should be started to the list
 ;; below passed to 'for-each'.
 ""(for-each start '())
@@ -285,7 +285,7 @@ create a template configuration file if non exists."
       %system-socket-dir
       (string-append %user-config-dir "/run")))
 
-;; Unix domain socket for receiving commands in dmd.
+;; Unix domain socket for receiving commands in shepherd.
 (define default-socket-file
   (string-append default-socket-dir "/socket"))
 
@@ -299,7 +299,7 @@ create a template configuration file if non exists."
       (string-append %localstatedir "/lib/shepherd/state")
       (string-append %user-config-dir "/state")))
 
-;; Global variables set from (dmd).
+;; Global variables set from (shepherd).
 (define persistency #f)
 (define persistency-state-file default-persistency-state-file)
 
diff --git a/tests/no-home.sh b/tests/no-home.sh
index 32fa842..85b6116 100644
--- a/tests/no-home.sh
+++ b/tests/no-home.sh
@@ -35,7 +35,7 @@ herd="herd -s $socket"
 trap "rm -f $socket;
       test -f $pid && kill \`cat $pid\` || true; rm -f $pid" EXIT
 
-# Make sure 'dmd' starts even though $HOME is not writable.
+# Make sure 'shepherd' starts even though $HOME is not writable.
 shepherd -I -s "$socket" -c /dev/null -l /dev/null --pid="$pid" &
 shepherd_pid="$!"
 
diff --git a/tests/sigint.sh b/tests/sigint.sh
index 4c78ff7..253bf04 100644
--- a/tests/sigint.sh
+++ b/tests/sigint.sh
@@ -48,7 +48,7 @@ shepherd -I -s "$socket" -c "$conf" --pid="$pid" &
 
 while [ ! -f "$pid" ] ; do sleep 0.5 ; done
 
-# Send SIGINT to dmd.
+# Send SIGINT to shepherd.
 kill -INT "`cat "$pid"`"
 while kill -0 "`cat "$pid"`" ; do sleep 0.5 ; done
 
-- 
2.6.3

Re: [PATCH 8/8] Replace "dmd" with "shepherd" in comments and strings.

[Ludovic Courtès]

Alex Kost <alezost@gmail.com> skribis:

> * modules/shepherd/support.scm: Use "shepherd" instead of "dmd"
>   everywhere.
> * configure.ac: Likewise.
> * tests/no-home.sh: Likewise.
> * tests/sigint.sh: Likewise.

OK!

I think you closed most of the TODO items for the release.  :-)

So I would like to try it in GuixSD to make sure we didn’t break
anything obvious, and then we can hopefully release it this week.

WDYT?

Thank you!

Ludo’.

Re: [PATCH 8/8] Replace "dmd" with "shepherd" in comments and strings.

[Alex Kost]

Ludovic Courtès (2016-01-25 18:13 +0300) wrote:

> Alex Kost <alezost@gmail.com> skribis:
>
>> * modules/shepherd/support.scm: Use "shepherd" instead of "dmd"
>>   everywhere.
>> * configure.ac: Likewise.
>> * tests/no-home.sh: Likewise.
>> * tests/sigint.sh: Likewise.
>
> OK!
>
> I think you closed most of the TODO items for the release.  :-)
>
> So I would like to try it in GuixSD to make sure we didn’t break
> anything obvious, and then we can hopefully release it this week.

I already use it for my user services.  No visible breaks so far, but of
course testing it as PID 1 will be a real check.

> WDYT?

I agree :-)

-- 
Alex