Merge branch 'release/0.22.5'

.pkgmeta-rclootcouncil

@@ -10,7 +10,7 @@ ignore:
     - changelog.md
     - __tests
     - .specs
-    - Libs                  # Packager not too keen on ignoring Libs anymore
+    - Libs
     - RCLootCouncil.toc
 
 enable-nolib-creation: no

.scripts/build.sh

@@ -12,25 +12,21 @@ rm -r "./.tmp"
 mkdir "$curDir/.tmp/"
 mkdir "$curDir/.tmp/RCLootCouncil_Classic"
 
-# Build RCLootCouncil (locale only) (and skip Libs as they shouldn't be processed with the keyword replacements)
-( bash "$release_script" -dLsz -t "$curDir/RCLootCouncil" -r "$curDir/.tmp/RCLootCouncil_Classic" -p 39928 -m ".pkgmeta-rclootcouncil" )
+# Build RCLootCouncil (.pkgmeta-rclootcouncil ignores "Libs" as they shouldn't be processed with the keyword replacements)
+( bash "$release_script" -dLz -t "$curDir/RCLootCouncil" -r "$curDir/.tmp/RCLootCouncil_Classic" -p 39928 -m ".pkgmeta-rclootcouncil" )
 # Now just copy the original libs to the build
 cp -R "$curDir/RCLootCouncil/Libs/" "$curDir/.tmp/RCLootCouncil_Classic/RCLootCouncil/"
 
-# # Do replacements
+# Do replacements
 . "./.scripts/replace.sh" "$curDir/.tmp/RCLootCouncil_Classic"
 
-# Build for Classic Era
+# Build Classic addon
 # -d: Skip Upload
 # -z: Skip zip
-"$release_script" -do -g classic -r "$curDir/.tmp" -m ".pkgmeta-build"
+"$release_script" -oS -r "$curDir/.tmp" -m ".pkgmeta-build"
 
-# Build for BBC
-"$release_script" -do -g cata -r "$curDir/.tmp" -m ".pkgmeta-build"
-
-
-# # Move the zip
+# Move the zip
 mv .tmp/*.zip "./.release/"
 
-# # And delete .tmp
+# And delete .tmp
 rm -r "./.tmp"

.scripts/deploy.sh

@@ -14,7 +14,7 @@ usage() {
 	echo "Usage: test.sh [-cbp]" >&2
 	echo "  -c               Pack to _classic_era_ WoW edition. (Classic)" >&2
 	echo "  -b               Pack to _classic_ WoW edition. (Cataclysm)" >&2
-	echo "  -bp              Pack to _classic_ptr_ WoW edition. (Cataclysm PTR)" >&2
+	echo "  -z               Pack to _classic_ptr_ WoW edition. (Cataclysm PTR)" >&2
 	echo "  -p               Pack to _ptr_ WoW edition." >&2
 }
 
@@ -23,13 +23,13 @@ ADDON="$(basename $ADDON_LOC)"
 WOWEDITION="_retail_"
 
 # Commandline inputs
-while getopts ":cbp" opt; do
+while getopts ":cbzp" opt; do
 	case $opt in
       c)
          WOWEDITION="_classic_era_";;
       b)
          WOWEDITION="_classic_";;
-      bp)
+      z)
          WOWEDITION="_classic_ptr_";;
       p)
          WOWEDITION="_ptr_";;