From 144f1344adf60815c8c57e93b5ed0acf98bbc40f Mon Sep 17 00:00:00 2001
From: Daniel Joseph Barnhart Clark <dclark@pobox.com>
Date: Thu, 24 Aug 2006 03:21:17 +0000
Subject: EncapPackages: A bunch of changes, including but not limited to:  *
 Cleaner directory structure  * Numerous Makefile improvements    * Makefile
 no longer tied to specific versions of encap packages      (except in the
 case of python-apt, which is distro-specific)    * Automatic dependancy
 generation from encap package files  * bcfg2-site pretty much done

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2103 ce84e21b-d406-0410-9b95-82705330c041
---
 encap/src/encap-profiles/ostiary-3.4.ep | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'encap/src/encap-profiles/ostiary-3.4.ep')

diff --git a/encap/src/encap-profiles/ostiary-3.4.ep b/encap/src/encap-profiles/ostiary-3.4.ep
index be0c4fbdb..c3d95c6c0 100644
--- a/encap/src/encap-profiles/ostiary-3.4.ep
+++ b/encap/src/encap-profiles/ostiary-3.4.ep
@@ -7,8 +7,8 @@
 	pkgspec="ostiary-3.4"
 >
 
-<prereq package="patch-2.5.9" />
 <prereq package="m4-1.4.4" />
+<prereq package="patch-2.5.9" />
 
 <environment
         variable="CC"
@@ -71,22 +71,22 @@ url="http://www.pobox.com/users/dclark/mirror/ostiary/ostiary-3.4.tar.gz
 
 <prepackage>
 # /usr/local/etc stuff
-mkdir share 2>/dev/null || exit 1
-mkdir share/doc 2>/dev/null || exit 1
-mkdir share/doc/ostiary 2>/dev/null || exit 1
-mkdir share/doc/ostiary/examples 2>/dev/null || exit 1
+test -d share || mkdir share
+test -d share/doc || mkdir share/doc
+test -d share/doc/ostiary || mkdir share/doc/ostiary
+test -d share/doc/ostiary/examples || mkdir share/doc/ostiary/examples
 mv etc/ostiary.cfg share/doc/ostiary/examples/ostiary.cfg
 rmdir etc
 # daemons should be in /usr/local/sbin
-mkdir sbin 2>/dev/null || exit 1
+test -d sbin || mkdir sbin
 mv bin/ostiaryd sbin/ostiaryd
 # daemontool stuff
-mkdir var 2>/dev/null || exit 1
-mkdir var/svc.d 2>/dev/null || exit 1
-mkdir var/svc.d/ostiary 2>/dev/null || exit 1
-mkdir var/svc.d/ostiary/log 2>/dev/null || exit 1
-# encap stuff
-mkdir var/encap 2>/dev/null || exit 0
+test -d var || mkdir var
+test -d var/svc.d || mkdir var/svc.d
+test -d var/svc.d/ostiary || mkdir var/svc.d/ostiary
+test -d var/svc.d/ostiary/log || mkdir var/svc.d/ostiary/log
+# Make "this encap is installed" sentinal file available in /usr/local/var/encap
+test -d var/encap || mkdir var/encap
 touch var/encap/${ENCAP_PKGNAME}
 </prepackage>
 
-- 
cgit v1.2.3-1-g7c22