runit

commit 62cb42614d493cb5bc45cad31fc552f48b3c3b92
parent eda3a7b184789db1032c5b37e8e517db674bc860
Author: Gerrit Pape <pape@smarden.org>
Date:   Sat, 26 Jun 2004 14:50:07 +0000

  * package/check, package/compile, package/install-man, package/upgrade:
    minor cleanup.

Diffstat:
M
package/CHANGES
 | 
2
++
M
package/check
 | 
6
+++---
M
package/compile
 | 
6
+++---
M
package/install-man
 | 
4
++--
M
package/upgrade
 | 
4
++--

5 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/package/CHANGES b/package/CHANGES
@@ -3,6 +3,8 @@ Sat, 26 Jun 2004 14:23:30 +0000
   * chpst.c, man/chpst.8: new option -/ chroot.
   * runit.c, man/runit.8: if stage 1 crashes or exits 100, stage 2 will be
     skipped; if stage 2 crashes or exits 111, it will be restarted.
+  * package/check, package/compile, package/install-man, package/upgrade:
+    minor cleanup.
   * doc/runscripts.html: add, adapt various run scripts (thx).
 
 runit 1.0.2
diff --git a/package/check b/package/check
@@ -1,8 +1,8 @@
 #!/bin/sh -e
 
 umask 022
-test -d package || ( echo 'Wrong working directory.'; exit 1 ) || exit 1
-test -d compile || ( echo 'Wrong working directory.'; exit 1 ) || exit 1
+test -d package || sh -cx '! : Wrong working directory.'
+test -d compile || sh -cx '! : Wrong working directory.'
 
 echo 'Checking commands in ./command...'
-( cd compile; exec make check ) || exit 1
+sh -cxe 'cd compile; exec make check'
diff --git a/package/compile b/package/compile
@@ -1,8 +1,8 @@
 #!/bin/sh -e
 
 umask 022
-test -d package || ( echo 'Wrong working directory.'; exit 1 ) || exit 1
-test -d src || ( echo 'Wrong working directory.'; exit 1 ) || exit 1
+test -d package || sh -cx '! : Wrong working directory.'
+test -d src || sh -cx '! : Wrong working directory.'
 
 here=`env - PATH=$PATH pwd`
 
@@ -16,7 +16,7 @@ for i in `ls src`; do
 done
 
 echo 'Compiling everything in ./compile...'
-( cd compile; exec make ) || exit 1
+sh -cxe 'cd compile; exec make'
 
 echo 'Copying commands into ./command...'
 for i in `cat package/commands`; do
diff --git a/package/install-man b/package/install-man
@@ -1,8 +1,8 @@
 #!/bin/sh -e
 
 umask 022
-test -d package || ( echo 'Wrong working directory.'; exit 1 ) || exit 1
-test -d man || ( echo 'Wrong working directory.'; exit 1 ) || exit 1
+test -d package || sh -cx '! : Wrong working directory.'
+test -d man || sh -cx '! : Wrong working directory.'
 
 here=`env - PATH=$PATH pwd`
 parent=`dirname $here`
diff --git a/package/upgrade b/package/upgrade
@@ -1,8 +1,8 @@
 #!/bin/sh -e
 
 umask 022
-test -d package || ( echo 'Wrong working directory.'; exit 1 ) || exit 1
-test -d src || ( echo 'Wrong working directory.'; exit 1 ) || exit 1
+test -d package || sh -cx '! : Wrong working directory.'
+test -d src || sh -cx '! : Wrong working directory.'
 
 here=`env - PATH=$PATH pwd`
 parent=`dirname $here`