diff options
author | Steve Powell <steve@rabbitmq.com> | 2012-02-22 15:02:20 +0000 |
---|---|---|
committer | Steve Powell <steve@rabbitmq.com> | 2012-02-22 15:02:20 +0000 |
commit | 3d6325b54f6d66305652ef2f5461e551435c796f (patch) | |
tree | 0f35cd86ee33a12be9f95c87803a3cbe2c89690d | |
parent | 12fcf5e1be40cb77dbabee1f827a50c84dd7b37b (diff) | |
download | rabbitmq-server-3d6325b54f6d66305652ef2f5461e551435c796f.tar.gz |
Backout sed -i replacements
-rw-r--r-- | packaging/RPMS/Fedora/Makefile | 21 | ||||
-rw-r--r-- | packaging/debs/Debian/Makefile | 15 | ||||
-rw-r--r-- | packaging/macports/Makefile | 4 | ||||
-rwxr-xr-x | packaging/macports/make-port-diff.sh | 3 |
4 files changed, 19 insertions, 24 deletions
diff --git a/packaging/RPMS/Fedora/Makefile b/packaging/RPMS/Fedora/Makefile index 2031de4d..c67d8fd6 100644 --- a/packaging/RPMS/Fedora/Makefile +++ b/packaging/RPMS/Fedora/Makefile @@ -26,23 +26,20 @@ prepare: mkdir -p BUILD SOURCES SPECS SRPMS RPMS tmp cp $(TARBALL_DIR)/$(TARBALL) SOURCES cp rabbitmq-server.spec SPECS - sed -e 's|%%VERSION%%|$(VERSION)|;s|%%REQUIRES%%|$(REQUIRES)|' \ - SPECS/rabbitmq-server.spec >SPECS/rabbitmq-server.spec.tmp \ - && mv SPECS/rabbitmq-server.spec.tmp SPECS/rabbitmq-server.spec + sed -i 's|%%VERSION%%|$(VERSION)|;s|%%REQUIRES%%|$(REQUIRES)|' \ + SPECS/rabbitmq-server.spec cp ${COMMON_DIR}/* SOURCES/ - sed -e 's|^LOCK_FILE=.*$$|LOCK_FILE=/var/lock/subsys/$$NAME|' \ - SOURCES/rabbitmq-server.init >SOURCES/rabbitmq-server.init.tmp \ - && mv SOURCES/rabbitmq-server.init.tmp SOURCES/rabbitmq-server.init + sed -i \ + -e 's|^LOCK_FILE=.*$$|LOCK_FILE=/var/lock/subsys/$$NAME|' \ + SOURCES/rabbitmq-server.init ifeq "$(RPM_OS)" "fedora" # Fedora says that only vital services should have Default-Start - sed -e '/^# Default-Start:/d;/^# Default-Stop:/d' \ - SOURCES/rabbitmq-server.init >SOURCES/rabbitmq-server.init.tmp \ - && mv SOURCES/rabbitmq-server.init.tmp SOURCES/rabbitmq-server.init + sed -i -e '/^# Default-Start:/d;/^# Default-Stop:/d' \ + SOURCES/rabbitmq-server.init endif - sed -e 's|@SU_RABBITMQ_SH_C@|su rabbitmq -s /bin/sh -c|' \ - SOURCES/rabbitmq-script-wrapper >SOURCES/rabbitmq-script-wrapper.tmp \ - && mv SOURCES/rabbitmq-script-wrapper.tmp SOURCES/rabbitmq-script-wrapper + sed -i -e 's|@SU_RABBITMQ_SH_C@|su rabbitmq -s /bin/sh -c|' \ + SOURCES/rabbitmq-script-wrapper cp rabbitmq-server.logrotate SOURCES/rabbitmq-server.logrotate server: prepare diff --git a/packaging/debs/Debian/Makefile b/packaging/debs/Debian/Makefile index de9cf400..79e9c1dd 100644 --- a/packaging/debs/Debian/Makefile +++ b/packaging/debs/Debian/Makefile @@ -24,14 +24,13 @@ package: clean cp $(COMMON_DIR)/* $(UNPACKED_DIR)/debian/ # Debian and descendants differ from most other distros in that # runlevel 2 should start network services. - sed -e 's|^LOCK_FILE=.*$$|LOCK_FILE=|' \ - -e 's|^\(# Default-Start:\).*$$|\1 2 3 4 5|' \ - -e 's|^\(# Default-Stop:\).*$$|\1 0 1 6|' \ - $(UNPACKED_DIR)/debian/rabbitmq-server.init >$(UNPACKED_DIR)/debian/rabbitmq-server.init.tmp \ - && mv $(UNPACKED_DIR)/debian/rabbitmq-server.init.tmp $(UNPACKED_DIR)/debian/rabbitmq-server.init - sed -e 's|@SU_RABBITMQ_SH_C@|su rabbitmq -s /bin/sh -c|' \ - $(UNPACKED_DIR)/debian/rabbitmq-script-wrapper >$(UNPACKED_DIR)/debian/rabbitmq-script-wrapper.tmp \ - && mv $(UNPACKED_DIR)/debian/rabbitmq-script-wrapper.tmp $(UNPACKED_DIR)/debian/rabbitmq-script-wrapper + sed -i \ + -e 's|^LOCK_FILE=.*$$|LOCK_FILE=|' \ + -e 's|^\(# Default-Start:\).*$$|\1 2 3 4 5|' \ + -e 's|^\(# Default-Stop:\).*$$|\1 0 1 6|' \ + $(UNPACKED_DIR)/debian/rabbitmq-server.init + sed -i -e 's|@SU_RABBITMQ_SH_C@|su rabbitmq -s /bin/sh -c|' \ + $(UNPACKED_DIR)/debian/rabbitmq-script-wrapper chmod a+x $(UNPACKED_DIR)/debian/rules echo "This package was debianized by Tony Garnock-Jones <tonyg@rabbitmq.com> on\nWed, 3 Jan 2007 15:43:44 +0000.\n\nIt was downloaded from http://www.rabbitmq.com/\n\n" > $(UNPACKED_DIR)/debian/copyright cat $(UNPACKED_DIR)/LICENSE >> $(UNPACKED_DIR)/debian/copyright diff --git a/packaging/macports/Makefile b/packaging/macports/Makefile index 897fc183..4c146813 100644 --- a/packaging/macports/Makefile +++ b/packaging/macports/Makefile @@ -38,8 +38,8 @@ $(DEST)/Portfile: Portfile.in # needs vars such as HOME to be set. So we have to set them # explicitly. macports: dirs $(DEST)/Portfile - sed -e 's|@SU_RABBITMQ_SH_C@|SHELL=/bin/sh HOME=/var/lib/rabbitmq USER=rabbitmq LOGNAME=rabbitmq PATH="$$(eval `PATH=@MACPORTS_PREFIX@/bin /usr/libexec/path_helper -s`; echo $$PATH)" su -m rabbitmq -c|' \ - $(COMMON_DIR)/rabbitmq-script-wrapper >$(DEST)/files/rabbitmq-script-wrapper + sed -i -e 's|@SU_RABBITMQ_SH_C@|SHELL=/bin/sh HOME=/var/lib/rabbitmq USER=rabbitmq LOGNAME=rabbitmq PATH="$$(eval `PATH=MACPORTS_PREFIX/bin /usr/libexec/path_helper -s`; echo $$PATH)" su -m rabbitmq -c|' \ + $(DEST)/files/rabbitmq-script-wrapper cp patch-org.macports.rabbitmq-server.plist.diff $(DEST)/files if [ -n "$(MACPORTS_USERHOST)" ] ; then \ tar cf - -C $(MACPORTS_DIR) . | ssh $(SSH_OPTS) $(MACPORTS_USERHOST) ' \ diff --git a/packaging/macports/make-port-diff.sh b/packaging/macports/make-port-diff.sh index 0583b41b..3eb1b9f5 100755 --- a/packaging/macports/make-port-diff.sh +++ b/packaging/macports/make-port-diff.sh @@ -15,8 +15,7 @@ cd $dir/macports svn checkout http://svn.macports.org/repository/macports/trunk/dports/net/rabbitmq-server/ 2>&1 >/dev/null # Clear out the svn $id tag -sed -e 's|^# \$.*$|# $Id$|' rabbitmq-server/Portfile >rabbitmq-server/Portfile.tmp \ - && mv rabbitmq-server/Portfile.tmp rabbitmq-server/Portfile +sed -i -e 's|^# \$.*$|# $Id$|' rabbitmq-server/Portfile # Get the files from the rabbitmq.com macports repo cd ../rabbitmq |