Merge branch 'master' into luarocks-3

3 files changed, 35 insertions, 3 deletions

diff --git a/configure b/configure
index 8b99b2ae..75ba4039 100755
--- a/configure
+++ b/configure
@@ -71,7 +71,11 @@ EOF
 # Helper functions
 
 find_program() {
-    command -v "$1" 2>/dev/null
+   prog=`command -v "$1" 2>/dev/null`
+   if [ -n "$prog" ]
+   then
+      dirname "$prog"
+   fi
 }
 
 die() {
diff --git a/makedist b/makedist
index 1a9ca992..fb41b981 100755
--- a/makedist
+++ b/makedist
@@ -16,13 +16,40 @@ make clean || exit 1
 
 grep -q "\"$1\"" rockspec || {
    echo
-   echo "Version in rockspec is incorrect. Please fix it."
+   echo "version in rockspec is incorrect. Please fix it."
    exit 1
 }
 
 grep -q "program_version = \"$1\"" src/luarocks/cfg.lua || {
    echo
-   echo "Version in src/luarocks/cfg.lua is incorrect. Please fix it."
+   echo "program_version in src/luarocks/cfg.lua is incorrect. Please fix it."
+   exit 1
+}
+
+grep -q "version: $1\\." appveyor.yml || {
+   echo
+   echo "version in appveyor.yml is incorrect. Please fix it."
+   exit 1
+}
+
+grep -q "LUAROCKS_VER: $1" appveyor.yml || {
+   echo
+   echo "LUAROCKS_VER in appveyor.yml is incorrect. Please fix it."
+   exit 1
+}
+
+# e.g. if $1 is "2.3.0", $program_series is "2.3"
+program_series=${1%.*}
+
+grep -q "program_series = \"$program_series\"" src/luarocks/cfg.lua || {
+   echo
+   echo "program_series in src/luarocks/cfg.lua is incorrect. Please fix it."
+   exit 1
+}
+
+grep -q "vars.VERSION = \"$program_series\"" install.bat || {
+   echo
+   echo "vars.VERSION in install.bat is incorrect. Please fix it."
    exit 1
 }
 
diff --git a/test/testing.sh b/test/testing.sh
index abda18d4..86d7579b 100755
--- a/test/testing.sh
+++ b/test/testing.sh
@@ -279,6 +279,7 @@ mkdir -p "$testing_server"
    get "$luarocks_repo/validate-args-1.5.4-1.rockspec"
    get "https://raw.githubusercontent.com/brunoos/luasec/master/luasec-0.6alpha-2.rockspec"
    get "$luarocks_repo/luabitop-1.0.2-1.rockspec"
+   get "$luarocks_repo/luabitop-1.0.2-1.src.rock"
    get "$luarocks_repo/lpty-1.0.1-1.src.rock"
    get "$luarocks_repo/cprint-${verrev_cprint}.src.rock"
    get "$luarocks_repo/cprint-${verrev_cprint}.rockspec"