changing OFFICIAL_RELEASE to UNOFFICIAL_RELEASE in dist.sh; changing possible values for SKIP_MSIVAL2 to true and false

Author: Vlad Ionescu

dist-msi.sh

@@ -67,7 +67,7 @@ CYGWIN=nontsec
 
 ### Overrideable vars
 test "$RABBIT_VSN" || RABBIT_VSN=0.0.0
-test "$SKIP_MSIVAL2" || SKIP_MSIVAL2=
+test "$SKIP_MSIVAL2" || SKIP_MSIVAL2=false
 
 ### Other, general vars
 NAME=rabbitmq-dotnet-client
@@ -100,14 +100,14 @@ function build-msm-msi {
 
     candle -out ../tmp/wix/rabbitmq-dotnet-client-msm.wixobj dotnet-client-merge-module.wxs
     light -out ../tmp/wix/rabbitmq-dotnet-client.msm ../tmp/wix/rabbitmq-dotnet-client-msm.wixobj
-    test "$SKIP_MSIVAL2" || MsiVal2.exe ../tmp/wix/rabbitmq-dotnet-client.msm ../lib/wix/mergemod.cub -f
+    test "$SKIP_MSIVAL2" == "true" || MsiVal2.exe ../tmp/wix/rabbitmq-dotnet-client.msm ../lib/wix/mergemod.cub -f
 
     candle -out ../tmp/wix/rabbitmq-dotnet-client-msi.wixobj dotnet-client-product.wxs
     light -out ../tmp/wix/rabbitmq-dotnet-client.msi \
         ../tmp/wix/rabbitmq-dotnet-client-msi.wixobj \
         ../lib/wix/wixui.wixlib \
         -loc WixUI_en-us.wxl
-    test "$SKIP_MSIVAL2" || MsiVal2.exe ../tmp/wix/rabbitmq-dotnet-client.msi ../lib/wix/darice.cub -f
+    test "$SKIP_MSIVAL2" == "true" || MsiVal2.exe ../tmp/wix/rabbitmq-dotnet-client.msi ../lib/wix/darice.cub -f
 
     cd ..
 

dist.sh

@@ -69,7 +69,7 @@ CYGWIN=nontsec
 ### Overrideable vars
 test "$KEYFILE" || KEYFILE=rabbit-mock.snk
 test "$RABBIT_VSN" || RABBIT_VSN=0.0.0
-test "$OFFICIAL_RELEASE" || OFFICIAL_RELEASE=
+test "$UNOFFICIAL_RELEASE" || UNOFFICIAL_RELEASE=true
 test "$MSBUILD" || MSBUILD=msbuild.exe
 test "$RABBIT_WEBSITE" || RABBIT_WEBSITE=http://www.rabbitmq.com
 
@@ -87,7 +87,7 @@ function main {
     ### Check keyfile exists and generate if necessary, or exit with error if
     ### we're building an official release
     if [ ! -f "$KEYFILE" ]; then
-        if [ ! "$OFFICIAL_RELEASE" ]; then
+        if [ "$UNOFFICIAL_RELEASE" == "true" ]; then
             sn -k $KEYFILE
         else
             echo "ERROR! Keyfile $KEYFILE not found."