merge default into bug23056

14 files changed, 94 insertions, 382 deletions

diff --git a/packaging/RPMS/Fedora/Makefile b/packaging/RPMS/Fedora/Makefile
index 287945fe1b..c67d8fd6e1 100644
--- a/packaging/RPMS/Fedora/Makefile
+++ b/packaging/RPMS/Fedora/Makefile
@@ -12,7 +12,7 @@ ifndef RPM_OS
 RPM_OS=fedora
 endif
 
-ifeq "x$(RPM_OS)" "xsuse"
+ifeq "$(RPM_OS)" "suse"
 REQUIRES=/sbin/chkconfig /sbin/service
 OS_DEFINES=--define '_initrddir /etc/init.d' --define 'dist .suse'
 else
@@ -33,6 +33,11 @@ prepare:
 	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 -i -e '/^# Default-Start:/d;/^# Default-Stop:/d' \
+	    SOURCES/rabbitmq-server.init
+endif
 	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
@@ -40,5 +45,5 @@ prepare:
 server: prepare
 	rpmbuild -ba --nodeps SPECS/rabbitmq-server.spec $(DEFINES) $(OS_DEFINES)
 
-clean:	
+clean:
 	rm -rf SOURCES SPECS RPMS SRPMS BUILD tmp
diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec
index 009d52998e..ffc826eb0e 100644
--- a/packaging/RPMS/Fedora/rabbitmq-server.spec
+++ b/packaging/RPMS/Fedora/rabbitmq-server.spec
@@ -64,12 +64,8 @@ mkdir -p %{buildroot}%{_sysconfdir}/rabbitmq
 rm %{_maindir}/LICENSE %{_maindir}/LICENSE-MPL-RabbitMQ %{_maindir}/INSTALL
 
 #Build the list of files
-rm -f %{_builddir}/%{name}.files
-echo '%defattr(-,root,root, -)' >> %{_builddir}/%{name}.files 
-(cd %{buildroot}; \
-    find . -type f ! -regex '\.%{_sysconfdir}.*' \
-        ! -regex '\.\(%{_rabbit_erllibdir}\|%{_rabbit_libdir}\).*' \
-        | sed -e 's/^\.//' >> %{_builddir}/%{name}.files)
+echo '%defattr(-,root,root, -)' >%{_builddir}/%{name}.files
+find %{buildroot} -path %{buildroot}%{_sysconfdir} -prune -o '!' -type d -printf "/%%P\n" >>%{_builddir}/%{name}.files
 
 %pre
 
@@ -116,8 +112,6 @@ done
 %attr(0750, rabbitmq, rabbitmq) %dir %{_localstatedir}/lib/rabbitmq
 %attr(0750, rabbitmq, rabbitmq) %dir %{_localstatedir}/log/rabbitmq
 %dir %{_sysconfdir}/rabbitmq
-%{_rabbit_erllibdir}
-%{_rabbit_libdir}
 %{_initrddir}/rabbitmq-server
 %config(noreplace) %{_sysconfdir}/logrotate.d/rabbitmq-server
 %doc LICENSE LICENSE-MPL-RabbitMQ
@@ -126,6 +120,15 @@ done
 rm -rf %{buildroot}
 
 %changelog
+* Thu Jun 9 2011 jerryk@vmware.com 2.5.0-1
+- New Upstream Release
+
+* Thu Apr 7 2011 Alexandru Scvortov <alexandru@rabbitmq.com> 2.4.1-1
+- New Upstream Release
+
+* Tue Mar 22 2011 Alexandru Scvortov <alexandru@rabbitmq.com> 2.4.0-1
+- New Upstream Release
+
 * Thu Feb 3 2011 simon@rabbitmq.com 2.3.1-1
 - New Upstream Release
 
diff --git a/packaging/common/rabbitmq-server.init b/packaging/common/rabbitmq-server.init
index c1647dc505..d8a7a94d56 100644
--- a/packaging/common/rabbitmq-server.init
+++ b/packaging/common/rabbitmq-server.init
@@ -10,8 +10,8 @@
 # Provides:          rabbitmq-server
 # Required-Start:    $remote_fs $network
 # Required-Stop:     $remote_fs $network
-# Default-Start:
-# Default-Stop:
+# Default-Start:     3 4 5
+# Default-Stop:      0 1 2 6
 # Description:       RabbitMQ broker
 # Short-Description: Enable AMQP service provided by RabbitMQ broker
 ### END INIT INFO
@@ -28,6 +28,7 @@ INIT_LOG_DIR=/var/log/rabbitmq
 LOCK_FILE= # This is filled in when building packages
 
 test -x $DAEMON || exit 0
+test -x $CONTROL || exit 0
 
 RETVAL=0
 set -e
@@ -94,13 +95,23 @@ status_rabbitmq() {
 
 rotate_logs_rabbitmq() {
     set +e
-    $DAEMON rotate_logs ${ROTATE_SUFFIX}
+    $CONTROL rotate_logs ${ROTATE_SUFFIX}
     if [ $? != 0 ] ; then
         RETVAL=1
     fi
     set -e
 }
 
+restart_running_rabbitmq () {
+    status_rabbitmq quiet
+    if [ $RETVAL = 0 ] ; then
+        restart_rabbitmq
+    else
+        echo RabbitMQ is not runnning
+        RETVAL=0
+    fi
+}
+
 restart_rabbitmq() {
     stop_rabbitmq
     start_rabbitmq
@@ -124,11 +135,16 @@ case "$1" in
         echo -n "Rotating log files for $DESC: "
         rotate_logs_rabbitmq
         ;;
-    force-reload|reload|restart|condrestart|try-restart)
+    force-reload|reload|restart)
         echo -n "Restarting $DESC: "
         restart_rabbitmq
         echo "$NAME."
         ;;
+    try-restart)
+        echo -n "Restarting $DESC: "
+        restart_running_rabbitmq
+        echo "$NAME."
+        ;;
     *)
         echo "Usage: $0 {start|stop|status|rotate-logs|restart|condrestart|try-restart|reload|force-reload}" >&2
         RETVAL=1
diff --git a/packaging/common/rabbitmq-server.ocf b/packaging/common/rabbitmq-server.ocf
index 94999d0edf..d58c48ed52 100755
--- a/packaging/common/rabbitmq-server.ocf
+++ b/packaging/common/rabbitmq-server.ocf
@@ -103,9 +103,9 @@ The IP Port for rabbitmq-server to listen on
 
 <parameter name="config_file" unique="0" required="0">
 <longdesc lang="en">
-Location of the config file
+Location of the config file (without the .config suffix)
 </longdesc>
-<shortdesc lang="en">Config file path</shortdesc>
+<shortdesc lang="en">Config file path (without the .config suffix)</shortdesc>
 <content type="string" default="" />
 </parameter>
 
@@ -189,8 +189,8 @@ rabbit_validate_partial() {
 }
 
 rabbit_validate_full() {
-    if [ ! -z $RABBITMQ_CONFIG_FILE ] && [ ! -e $RABBITMQ_CONFIG_FILE ]; then
-        ocf_log err "rabbitmq-server config_file $RABBITMQ_CONFIG_FILE does not exist or is not a file";
+    if [ ! -z $RABBITMQ_CONFIG_FILE ] && [ ! -e "${RABBITMQ_CONFIG_FILE}.config" ]; then
+        ocf_log err "rabbitmq-server config_file ${RABBITMQ_CONFIG_FILE}.config does not exist or is not a file";
         exit $OCF_ERR_INSTALLED;
     fi
 
diff --git a/packaging/debs/Debian/Makefile b/packaging/debs/Debian/Makefile
index d937fbb2eb..38c81134a2 100644
--- a/packaging/debs/Debian/Makefile
+++ b/packaging/debs/Debian/Makefile
@@ -19,11 +19,15 @@ all:
 
 package: clean
 	cp $(TARBALL_DIR)/$(TARBALL) $(DEBIAN_ORIG_TARBALL)
-	tar -zxvf $(DEBIAN_ORIG_TARBALL)
+	tar -zxf $(DEBIAN_ORIG_TARBALL)
 	cp -r debian $(UNPACKED_DIR)
 	cp $(COMMON_DIR)/* $(UNPACKED_DIR)/debian/
+# Debian and descendants differ from most other distros in that
+# runlevel 2 should start network services.
 	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
diff --git a/packaging/debs/Debian/debian/changelog b/packaging/debs/Debian/debian/changelog
index 12165dc0ac..1cab4235dd 100644
--- a/packaging/debs/Debian/debian/changelog
+++ b/packaging/debs/Debian/debian/changelog
@@ -1,3 +1,21 @@
+rabbitmq-server (2.5.0-1) lucid; urgency=low
+
+  * New Upstream Release
+
+ --  <jerryk@vmware.com>  Thu, 09 Jun 2011 07:20:29 -0700
+
+rabbitmq-server (2.4.1-1) lucid; urgency=low
+
+  * New Upstream Release
+
+ -- Alexandru Scvortov <alexandru@rabbitmq.com>  Thu, 07 Apr 2011 16:49:22 +0100
+
+rabbitmq-server (2.4.0-1) lucid; urgency=low
+
+  * New Upstream Release
+
+ -- Alexandru Scvortov <alexandru@rabbitmq.com>  Tue, 22 Mar 2011 17:34:31 +0000
+
 rabbitmq-server (2.3.1-1) lucid; urgency=low
 
   * New Upstream Release
diff --git a/packaging/debs/Debian/debian/control b/packaging/debs/Debian/debian/control
index 02da0cc6e4..45f5c5c443 100644
--- a/packaging/debs/Debian/debian/control
+++ b/packaging/debs/Debian/debian/control
@@ -7,10 +7,7 @@ Standards-Version: 3.8.0
 
 Package: rabbitmq-server
 Architecture: all
-# erlang-inets is not a strict dependency, but it's needed to allow
-# the installation of plugins that use mochiweb. Ideally it would be a
-# "Recommends" instead, but gdebi does not install those.
-Depends: erlang-base (>= 1:12.b.3) | erlang-base-hipe (>= 1:12.b.3), erlang-ssl | erlang-nox (<< 1:13.b-dfsg1-1), erlang-os-mon | erlang-nox (<< 1:13.b-dfsg1-1), erlang-mnesia | erlang-nox (<< 1:13.b-dfsg1-1), erlang-inets | erlang-nox (<< 1:13.b-dfsg1-1), adduser, logrotate, ${misc:Depends}
+Depends: erlang-nox (>= 1:12.b.3), adduser, logrotate, ${misc:Depends}
 Description: An AMQP server written in Erlang
  RabbitMQ is an implementation of AMQP, the emerging standard for high
  performance enterprise messaging. The RabbitMQ server is a robust and
diff --git a/packaging/generic-unix/Makefile b/packaging/generic-unix/Makefile
index c4e01f4a4b..b5c342aad7 100644
--- a/packaging/generic-unix/Makefile
+++ b/packaging/generic-unix/Makefile
@@ -4,7 +4,7 @@ TARGET_DIR=rabbitmq_server-$(VERSION)
 TARGET_TARBALL=rabbitmq-server-generic-unix-$(VERSION)
 
 dist:
-	tar -zxvf ../../dist/$(SOURCE_DIR).tar.gz
+	tar -zxf ../../dist/$(SOURCE_DIR).tar.gz
 
 	$(MAKE) -C $(SOURCE_DIR) \
 		TARGET_DIR=`pwd`/$(TARGET_DIR) \
diff --git a/packaging/macports/Portfile.in b/packaging/macports/Portfile.in
index c69c4f94d4..4a866305d4 100644
--- a/packaging/macports/Portfile.in
+++ b/packaging/macports/Portfile.in
@@ -5,7 +5,7 @@ PortSystem 1.0
 name		rabbitmq-server
 version		@VERSION@
 categories	net 
-maintainers	paperplanes.de:meyer rabbitmq.com:tonyg openmaintainer
+maintainers	paperplanes.de:meyer openmaintainer
 platforms	darwin
 supported_archs	noarch
 
@@ -23,12 +23,12 @@ distfiles      ${name}-${version}${extract.suffix} \
                ${name}-generic-unix-${version}${extract.suffix}
 
 checksums \
-    ${name}-${version}${extract.suffix} md5 @md5-src@ \
-    ${name}-${version}${extract.suffix} sha1 @sha1-src@ \
-    ${name}-${version}${extract.suffix} rmd160 @rmd160-src@ \
-    ${name}-generic-unix-${version}${extract.suffix} md5 @md5-bin@ \
-    ${name}-generic-unix-${version}${extract.suffix} sha1 @sha1-bin@ \
-    ${name}-generic-unix-${version}${extract.suffix} rmd160 @rmd160-bin@
+    ${name}-${version}${extract.suffix} \
+        sha1 @sha1-src@ \
+        rmd160 @rmd160-src@ \
+    ${name}-generic-unix-${version}${extract.suffix} \
+        sha1 @sha1-bin@ \
+        rmd160 @rmd160-bin@
 
 depends_lib	port:erlang
 depends_build	port:libxslt
@@ -100,9 +100,9 @@ post-destroot {
                 ${wrappersbin}/rabbitmq-server
     file copy ${wrappersbin}/rabbitmq-server ${wrappersbin}/rabbitmqctl
 
-    file copy ${mansrc}/man1/rabbitmq-server.1.gz ${mandest}/man1/
-    file copy ${mansrc}/man1/rabbitmqctl.1.gz     ${mandest}/man1/
-    file copy ${mansrc}/man5/rabbitmq-env.conf.5.gz ${mandest}/man5/
+    xinstall -m 644 -W ${mansrc}/man1 rabbitmq-server.1.gz rabbitmqctl.1.gz \
+        ${mandest}/man1/
+    xinstall -m 644 -W ${mansrc}/man5 rabbitmq-env.conf.5.gz ${mandest}/man5/
 }
 
 pre-install {
diff --git a/packaging/macports/make-checksums.sh b/packaging/macports/make-checksums.sh
index 11424dfcba..891de6ba65 100755
--- a/packaging/macports/make-checksums.sh
+++ b/packaging/macports/make-checksums.sh
@@ -6,7 +6,7 @@ for type in src bin
 do
     tarball_var=tarball_${type}
     tarball=${!tarball_var}
-    for algo in md5 sha1 rmd160
+    for algo in sha1 rmd160
     do
         checksum=$(openssl $algo ${tarball} | awk '{print $NF}')
         echo "s|@$algo-$type@|$checksum|g"
diff --git a/packaging/windows-exe/Makefile b/packaging/windows-exe/Makefile
index 59803f9ce9..ab50e30b1d 100644
--- a/packaging/windows-exe/Makefile
+++ b/packaging/windows-exe/Makefile
@@ -2,7 +2,7 @@ VERSION=0.0.0
 ZIP=../windows/rabbitmq-server-windows-$(VERSION)
 
 dist: rabbitmq-$(VERSION).nsi rabbitmq_server-$(VERSION)
-	makensis rabbitmq-$(VERSION).nsi
+	makensis -V2 rabbitmq-$(VERSION).nsi
 
 rabbitmq-$(VERSION).nsi: rabbitmq_nsi.in
 	sed \
@@ -10,7 +10,7 @@ rabbitmq-$(VERSION).nsi: rabbitmq_nsi.in
 	    $< > $@
 
 rabbitmq_server-$(VERSION):
-	unzip $(ZIP)
+	unzip -q $(ZIP)
 
 clean:
 	rm -rf rabbitmq-*.nsi rabbitmq_server-* rabbitmq-server-*.exe
diff --git a/packaging/windows-exe/lib/EnvVarUpdate.nsh b/packaging/windows-exe/lib/EnvVarUpdate.nsh
deleted file mode 100644
index 839d6a0206..0000000000
--- a/packaging/windows-exe/lib/EnvVarUpdate.nsh
+++ /dev/null
@@ -1,327 +0,0 @@
-/**

- *  EnvVarUpdate.nsh

- *    : Environmental Variables: append, prepend, and remove entries

- *

- *     WARNING: If you use StrFunc.nsh header then include it before this file

- *              with all required definitions. This is to avoid conflicts

- *

- *  Usage:

- *    ${EnvVarUpdate} "ResultVar" "EnvVarName" "Action" "RegLoc" "PathString"

- *

- *  Credits:

- *  Version 1.0 

- *  * Cal Turney (turnec2)

- *  * Amir Szekely (KiCHiK) and e-circ for developing the forerunners of this

- *    function: AddToPath, un.RemoveFromPath, AddToEnvVar, un.RemoveFromEnvVar,

- *    WriteEnvStr, and un.DeleteEnvStr

- *  * Diego Pedroso (deguix) for StrTok

- *  * Kevin English (kenglish_hi) for StrContains

- *  * Hendri Adriaens (Smile2Me), Diego Pedroso (deguix), and Dan Fuhry  

- *    (dandaman32) for StrReplace

- *

- *  Version 1.1 (compatibility with StrFunc.nsh)

- *  * techtonik

- *

- *  http://nsis.sourceforge.net/Environmental_Variables:_append%2C_prepend%2C_and_remove_entries

- *

- */

-

-

-!ifndef ENVVARUPDATE_FUNCTION

-!define ENVVARUPDATE_FUNCTION

-!verbose push

-!verbose 3

-!include "LogicLib.nsh"

-!include "WinMessages.NSH"

-!include "StrFunc.nsh"

-

-; ---- Fix for conflict if StrFunc.nsh is already includes in main file -----------------------

-!macro _IncludeStrFunction StrFuncName

-  !ifndef ${StrFuncName}_INCLUDED

-    ${${StrFuncName}}

-  !endif

-  !ifndef Un${StrFuncName}_INCLUDED

-    ${Un${StrFuncName}}

-  !endif

-  !define un.${StrFuncName} "${Un${StrFuncName}}"

-!macroend

-

-!insertmacro _IncludeStrFunction StrTok

-!insertmacro _IncludeStrFunction StrStr

-!insertmacro _IncludeStrFunction StrRep

-

-; ---------------------------------- Macro Definitions ----------------------------------------

-!macro _EnvVarUpdateConstructor ResultVar EnvVarName Action Regloc PathString

-  Push "${EnvVarName}"

-  Push "${Action}"

-  Push "${RegLoc}"

-  Push "${PathString}"

-    Call EnvVarUpdate

-  Pop "${ResultVar}"

-!macroend

-!define EnvVarUpdate '!insertmacro "_EnvVarUpdateConstructor"'

- 

-!macro _unEnvVarUpdateConstructor ResultVar EnvVarName Action Regloc PathString

-  Push "${EnvVarName}"

-  Push "${Action}"

-  Push "${RegLoc}"

-  Push "${PathString}"

-    Call un.EnvVarUpdate

-  Pop "${ResultVar}"

-!macroend

-!define un.EnvVarUpdate '!insertmacro "_unEnvVarUpdateConstructor"'

-; ---------------------------------- Macro Definitions end-------------------------------------

- 

-;----------------------------------- EnvVarUpdate start----------------------------------------

-!define hklm_all_users     'HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"'

-!define hkcu_current_user  'HKCU "Environment"'

- 

-!macro EnvVarUpdate UN

- 

-Function ${UN}EnvVarUpdate

- 

-  Push $0

-  Exch 4

-  Exch $1

-  Exch 3

-  Exch $2

-  Exch 2

-  Exch $3

-  Exch

-  Exch $4

-  Push $5

-  Push $6

-  Push $7

-  Push $8

-  Push $9

-  Push $R0

- 

-  /* After this point:

-  -------------------------

-     $0 = ResultVar     (returned)

-     $1 = EnvVarName    (input)

-     $2 = Action        (input)

-     $3 = RegLoc        (input)

-     $4 = PathString    (input)

-     $5 = Orig EnvVar   (read from registry)

-     $6 = Len of $0     (temp)

-     $7 = tempstr1      (temp)

-     $8 = Entry counter (temp)

-     $9 = tempstr2      (temp)

-     $R0 = tempChar     (temp)  */

- 

-  ; Step 1:  Read contents of EnvVarName from RegLoc

-  ;

-  ; Check for empty EnvVarName

-  ${If} $1 == ""

-    SetErrors

-    DetailPrint "ERROR: EnvVarName is blank"

-    Goto EnvVarUpdate_Restore_Vars

-  ${EndIf}

- 

-  ; Check for valid Action

-  ${If}    $2 != "A"

-  ${AndIf} $2 != "P"

-  ${AndIf} $2 != "R"

-    SetErrors

-    DetailPrint "ERROR: Invalid Action - must be A, P, or R"

-    Goto EnvVarUpdate_Restore_Vars

-  ${EndIf}

- 

-  ${If} $3 == HKLM

-    ReadRegStr $5 ${hklm_all_users} $1     ; Get EnvVarName from all users into $5

-  ${ElseIf} $3 == HKCU

-    ReadRegStr $5 ${hkcu_current_user} $1  ; Read EnvVarName from current user into $5

-  ${Else}

-    SetErrors

-    DetailPrint 'ERROR: Action is [$3] but must be "HKLM" or HKCU"'

-    Goto EnvVarUpdate_Restore_Vars

-  ${EndIf}

- 

-  ; Check for empty PathString

-  ${If} $4 == ""

-    SetErrors

-    DetailPrint "ERROR: PathString is blank"

-    Goto EnvVarUpdate_Restore_Vars

-  ${EndIf}

- 

-  ; Make sure we've got some work to do

-  ${If} $5 == ""

-  ${AndIf} $2 == "R"

-    SetErrors

-    DetailPrint "$1 is empty - Nothing to remove"

-    Goto EnvVarUpdate_Restore_Vars

-  ${EndIf}

- 

-  ; Step 2: Scrub EnvVar

-  ;

-  StrCpy $0 $5                             ; Copy the contents to $0

-  ; Remove spaces around semicolons (NOTE: spaces before the 1st entry or

-  ; after the last one are not removed here but instead in Step 3)

-  ${If} $0 != ""                           ; If EnvVar is not empty ...

-    ${Do}

-      ${${UN}StrStr} $7 $0 " ;"

-      ${If} $7 == ""

-        ${ExitDo}

-      ${EndIf}

-      ${${UN}StrRep} $0  $0 " ;" ";"         ; Remove '<space>;'

-    ${Loop}

-    ${Do}

-      ${${UN}StrStr} $7 $0 "; "

-      ${If} $7 == ""

-        ${ExitDo}

-      ${EndIf}

-      ${${UN}StrRep} $0  $0 "; " ";"         ; Remove ';<space>'

-    ${Loop}

-    ${Do}

-      ${${UN}StrStr} $7 $0 ";;" 

-      ${If} $7 == ""

-        ${ExitDo}

-      ${EndIf}

-      ${${UN}StrRep} $0  $0 ";;" ";"

-    ${Loop}

- 

-    ; Remove a leading or trailing semicolon from EnvVar

-    StrCpy  $7  $0 1 0

-    ${If} $7 == ";"

-      StrCpy $0  $0 "" 1                   ; Change ';<EnvVar>' to '<EnvVar>'

-    ${EndIf}

-    StrLen $6 $0

-    IntOp $6 $6 - 1

-    StrCpy $7  $0 1 $6

-    ${If} $7 == ";"

-     StrCpy $0  $0 $6                      ; Change ';<EnvVar>' to '<EnvVar>'

-    ${EndIf}

-    ; DetailPrint "Scrubbed $1: [$0]"      ; Uncomment to debug

-  ${EndIf}

- 

-  /* Step 3. Remove all instances of the target path/string (even if "A" or "P")

-     $6 = bool flag (1 = found and removed PathString)

-     $7 = a string (e.g. path) delimited by semicolon(s)

-     $8 = entry counter starting at 0

-     $9 = copy of $0

-     $R0 = tempChar      */

- 

-  ${If} $5 != ""                           ; If EnvVar is not empty ...

-    StrCpy $9 $0

-    StrCpy $0 ""

-    StrCpy $8 0

-    StrCpy $6 0

- 

-    ${Do}

-      ${${UN}StrTok} $7 $9 ";" $8 "0"      ; $7 = next entry, $8 = entry counter

- 

-      ${If} $7 == ""                       ; If we've run out of entries,

-        ${ExitDo}                          ;    were done

-      ${EndIf}                             ;

- 

-      ; Remove leading and trailing spaces from this entry (critical step for Action=Remove)

-      ${Do}

-        StrCpy $R0  $7 1

-        ${If} $R0 != " "

-          ${ExitDo}

-        ${EndIf}

-        StrCpy $7   $7 "" 1                ;  Remove leading space

-      ${Loop}

-      ${Do}

-        StrCpy $R0  $7 1 -1

-        ${If} $R0 != " "

-          ${ExitDo}

-        ${EndIf}

-        StrCpy $7   $7 -1                  ;  Remove trailing space

-      ${Loop}

-      ${If} $7 == $4                       ; If string matches, remove it by not appending it

-        StrCpy $6 1                        ; Set 'found' flag

-      ${ElseIf} $7 != $4                   ; If string does NOT match

-      ${AndIf}  $0 == ""                   ;    and the 1st string being added to $0,

-        StrCpy $0 $7                       ;    copy it to $0 without a prepended semicolon

-      ${ElseIf} $7 != $4                   ; If string does NOT match

-      ${AndIf}  $0 != ""                   ;    and this is NOT the 1st string to be added to $0,

-        StrCpy $0 $0;$7                    ;    append path to $0 with a prepended semicolon

-      ${EndIf}                             ;

- 

-      IntOp $8 $8 + 1                      ; Bump counter

-    ${Loop}                                ; Check for duplicates until we run out of paths

-  ${EndIf}

- 

-  ; Step 4:  Perform the requested Action

-  ;

-  ${If} $2 != "R"                          ; If Append or Prepend

-    ${If} $6 == 1                          ; And if we found the target

-      DetailPrint "Target is already present in $1. It will be removed and"

-    ${EndIf}

-    ${If} $0 == ""                         ; If EnvVar is (now) empty

-      StrCpy $0 $4                         ;   just copy PathString to EnvVar

-      ${If} $6 == 0                        ; If found flag is either 0

-      ${OrIf} $6 == ""                     ; or blank (if EnvVarName is empty)

-        DetailPrint "$1 was empty and has been updated with the target"

-      ${EndIf}

-    ${ElseIf} $2 == "A"                    ;  If Append (and EnvVar is not empty),

-      StrCpy $0 $0;$4                      ;     append PathString

-      ${If} $6 == 1

-        DetailPrint "appended to $1"

-      ${Else}

-        DetailPrint "Target was appended to $1"

-      ${EndIf}

-    ${Else}                                ;  If Prepend (and EnvVar is not empty),

-      StrCpy $0 $4;$0                      ;     prepend PathString

-      ${If} $6 == 1

-        DetailPrint "prepended to $1"

-      ${Else}

-        DetailPrint "Target was prepended to $1"

-      ${EndIf}

-    ${EndIf}

-  ${Else}                                  ; If Action = Remove

-    ${If} $6 == 1                          ;   and we found the target

-      DetailPrint "Target was found and removed from $1"

-    ${Else}

-      DetailPrint "Target was NOT found in $1 (nothing to remove)"

-    ${EndIf}

-    ${If} $0 == ""

-      DetailPrint "$1 is now empty"

-    ${EndIf}

-  ${EndIf}

- 

-  ; Step 5:  Update the registry at RegLoc with the updated EnvVar and announce the change

-  ;

-  ClearErrors

-  ${If} $3  == HKLM

-    WriteRegExpandStr ${hklm_all_users} $1 $0     ; Write it in all users section

-  ${ElseIf} $3 == HKCU

-    WriteRegExpandStr ${hkcu_current_user} $1 $0  ; Write it to current user section

-  ${EndIf}

- 

-  IfErrors 0 +4

-    MessageBox MB_OK|MB_ICONEXCLAMATION "Could not write updated $1 to $3"

-    DetailPrint "Could not write updated $1 to $3"

-    Goto EnvVarUpdate_Restore_Vars

- 

-  ; "Export" our change

-  SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000

- 

-  EnvVarUpdate_Restore_Vars:

-  ;

-  ; Restore the user's variables and return ResultVar

-  Pop $R0

-  Pop $9

-  Pop $8

-  Pop $7

-  Pop $6

-  Pop $5

-  Pop $4

-  Pop $3

-  Pop $2

-  Pop $1

-  Push $0  ; Push my $0 (ResultVar)

-  Exch

-  Pop $0   ; Restore his $0

- 

-FunctionEnd

- 

-!macroend   ; EnvVarUpdate UN

-!insertmacro EnvVarUpdate ""

-!insertmacro EnvVarUpdate "un."

-;----------------------------------- EnvVarUpdate end----------------------------------------

- 

-!verbose pop

-!endif

diff --git a/packaging/windows-exe/rabbitmq_nsi.in b/packaging/windows-exe/rabbitmq_nsi.in
index 6d79ffd4fc..27e4e1dc03 100644
--- a/packaging/windows-exe/rabbitmq_nsi.in
+++ b/packaging/windows-exe/rabbitmq_nsi.in
@@ -4,7 +4,6 @@
 !include WinMessages.nsh
 !include FileFunc.nsh
 !include WordFunc.nsh
-!include lib\EnvVarUpdate.nsh
 
 !define env_hklm 'HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"'
 !define uninstall "Software\Microsoft\Windows\CurrentVersion\Uninstall\RabbitMQ"
@@ -77,9 +76,6 @@ Section "RabbitMQ Server (required)" Rabbit
   File /r "rabbitmq_server-%%VERSION%%"
   File "rabbitmq.ico"
 
-  ; Add to PATH
-  ${EnvVarUpdate} $0 "PATH" "A" "HKLM" "$INSTDIR\rabbitmq_server-%%VERSION%%\sbin"
-
   ; Write the installation path into the registry
   WriteRegStr HKLM "SOFTWARE\VMware, Inc.\RabbitMQ Server" "Install_Dir" "$INSTDIR"
 
@@ -117,15 +113,18 @@ Section "Start Menu" RabbitStartMenu
   CreateDirectory "$APPDATA\RabbitMQ\db"
 
   CreateDirectory "$SMPROGRAMS\RabbitMQ Server"
-  CreateShortCut "$SMPROGRAMS\RabbitMQ Server\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0
-  CreateShortCut "$SMPROGRAMS\RabbitMQ Server\Plugins Directory.lnk" "$INSTDIR\rabbitmq_server-%%VERSION%%\plugins"
-  CreateShortCut "$SMPROGRAMS\RabbitMQ Server\Log Directory.lnk" "$APPDATA\RabbitMQ\log"
-  CreateShortCut "$SMPROGRAMS\RabbitMQ Server\Database Directory.lnk" "$APPDATA\RabbitMQ\db"
-  CreateShortCut "$SMPROGRAMS\RabbitMQ Server\(Re)Install Service.lnk" "$INSTDIR\rabbitmq_server-%%VERSION%%\sbin\rabbitmq-service.bat" "install" "$INSTDIR\rabbitmq.ico"
-  CreateShortCut "$SMPROGRAMS\RabbitMQ Server\Remove Service.lnk" "$INSTDIR\rabbitmq_server-%%VERSION%%\sbin\rabbitmq-service.bat" "remove" "$INSTDIR\rabbitmq.ico"
-  CreateShortCut "$SMPROGRAMS\RabbitMQ Server\Start Service.lnk" "$INSTDIR\rabbitmq_server-%%VERSION%%\sbin\rabbitmq-service.bat" "start" "$INSTDIR\rabbitmq.ico"
-  CreateShortCut "$SMPROGRAMS\RabbitMQ Server\Stop Service.lnk" "$INSTDIR\rabbitmq_server-%%VERSION%%\sbin\rabbitmq-service.bat" "stop" "$INSTDIR\rabbitmq.ico"
-
+  CreateShortCut "$SMPROGRAMS\RabbitMQ Server\Uninstall RabbitMQ.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0
+  CreateShortCut "$SMPROGRAMS\RabbitMQ Server\RabbitMQ Plugins.lnk" "$INSTDIR\rabbitmq_server-%%VERSION%%\plugins"
+  CreateShortCut "$SMPROGRAMS\RabbitMQ Server\RabbitMQ Logs.lnk" "$APPDATA\RabbitMQ\log"
+  CreateShortCut "$SMPROGRAMS\RabbitMQ Server\RabbitMQ Database Directory.lnk" "$APPDATA\RabbitMQ\db"
+  CreateShortCut "$SMPROGRAMS\RabbitMQ Server\RabbitMQ Service - (re)install.lnk" "$INSTDIR\rabbitmq_server-%%VERSION%%\sbin\rabbitmq-service.bat" "install" "$INSTDIR\rabbitmq.ico"
+  CreateShortCut "$SMPROGRAMS\RabbitMQ Server\RabbitMQ Service - remove.lnk" "$INSTDIR\rabbitmq_server-%%VERSION%%\sbin\rabbitmq-service.bat" "remove" "$INSTDIR\rabbitmq.ico"
+  CreateShortCut "$SMPROGRAMS\RabbitMQ Server\RabbitMQ Service - start.lnk" "$INSTDIR\rabbitmq_server-%%VERSION%%\sbin\rabbitmq-service.bat" "start" "$INSTDIR\rabbitmq.ico"
+  CreateShortCut "$SMPROGRAMS\RabbitMQ Server\RabbitMQ Service - stop.lnk" "$INSTDIR\rabbitmq_server-%%VERSION%%\sbin\rabbitmq-service.bat" "stop" "$INSTDIR\rabbitmq.ico"
+
+  SetOutPath "$INSTDIR\rabbitmq_server-%%VERSION%%\sbin"
+  CreateShortCut "$SMPROGRAMS\RabbitMQ Server\RabbitMQ Command Prompt (sbin dir).lnk" "$WINDIR\system32\cmd.exe" "" "$WINDIR\system32\cmd.exe"
+  SetOutPath $INSTDIR
 SectionEnd
 
 ;--------------------------------
@@ -157,9 +156,6 @@ Section "Uninstall"
   ExecWait '"$0" /C "$INSTDIR\rabbitmq_server-%%VERSION%%\sbin\rabbitmq-service.bat" stop'
   ExecWait '"$0" /C "$INSTDIR\rabbitmq_server-%%VERSION%%\sbin\rabbitmq-service.bat" remove'
 
-  ; Remove from PATH
-  ${un.EnvVarUpdate} $0 "PATH" "R" "HKLM" "$INSTDIR\rabbitmq_server-%%VERSION%%\sbin"
-
   ; Remove files and uninstaller
   RMDir /r "$INSTDIR\rabbitmq_server-%%VERSION%%"
   Delete "$INSTDIR\rabbitmq.ico"
diff --git a/packaging/windows/Makefile b/packaging/windows/Makefile
index dacfa6207f..a0be8d89e0 100644
--- a/packaging/windows/Makefile
+++ b/packaging/windows/Makefile
@@ -4,7 +4,7 @@ TARGET_DIR=rabbitmq_server-$(VERSION)
 TARGET_ZIP=rabbitmq-server-windows-$(VERSION)
 
 dist:
-	tar -zxvf ../../dist/$(SOURCE_DIR).tar.gz
+	tar -zxf ../../dist/$(SOURCE_DIR).tar.gz
 	$(MAKE) -C $(SOURCE_DIR)
 
 	mkdir $(SOURCE_DIR)/sbin
@@ -24,7 +24,7 @@ dist:
 	elinks -dump -no-references -no-numbering rabbitmq-service.html \
 		> $(TARGET_DIR)/readme-service.txt
 	todos $(TARGET_DIR)/readme-service.txt
-	zip -r $(TARGET_ZIP).zip $(TARGET_DIR)
+	zip -q -r $(TARGET_ZIP).zip $(TARGET_DIR)
 	rm -rf $(TARGET_DIR) rabbitmq-service.html
 
 clean: clean_partial