4 files changed, 35 insertions, 40 deletions

diff --git a/Makefile b/Makefile
index 26232d4b..97ccefa5 100644
--- a/Makefile
+++ b/Makefile
@@ -16,8 +16,8 @@ LUAROCKS_FILES = fs/unix/tools.lua fs/unix.lua fs/win32/tools.lua fs/win32.lua \
 fs/lua.lua persist.lua list.lua require.lua rep.lua dir.lua make_manifest.lua \
 command_line.lua install.lua build/command.lua build/cmake.lua build/make.lua \
 build/builtin.lua fetch/cvs.lua fetch/git.lua fetch/sscm.lua tools/patch.lua \
-tools/zip.lua tools/tar.lua pack.lua type_check.lua make.lua path.lua \
-remove.lua fs.lua manif.lua add.lua deps.lua build.lua search.lua \
+fetch/svn.lua tools/zip.lua tools/tar.lua pack.lua type_check.lua make.lua path.lua \
+remove.lua fs.lua manif.lua add.lua deps.lua build.lua search.lua show.lua \
 manif_core.lua fetch.lua unpack.lua validate.lua cfg.lua download.lua \
 help.lua util.lua index.lua cache.lua add.lua refresh_cache.lua loader.lua
 
diff --git a/makedist b/makedist
index 72b53caf..44ba3cd4 100755
--- a/makedist
+++ b/makedist
@@ -1,69 +1,64 @@
 #!/bin/sh
 
-svnlist() {
-   if [ "$1" ]
-   then local prefix="$1/"
-   fi   
-   svn list $1 | grep -v "^?" | while read line
-   do
-      local path="$prefix$line"
-      echo "$path"
-      if [ -d "$path" ]
-      then
-         svnlist "$path"
-      fi
-   done
-}
-
 if ! [ "$1" ]
 then
    echo "usage: $0 <version>"
    exit 1
 fi
 
-svn list > /dev/null 2> /dev/null
-if [ $? != 0 ]
+if ! [ -d ".git" ]
 then
-   echo "Your version of svn may be too old."
+   echo "Should be run inside a git repo dir."
    exit 1
 fi
 
-make clean
+make clean || exit 1
 
 out="luarocks-$1"
 rm -rf "$out"
 mkdir "$out"
-list=`svnlist`
-echo $list
-rm -f missing_ref
-echo "$list" | while read i
+rm -f "missing_ref"
+git ls-files | while read i
 do
    if [ -f "$i" ]
    then
       dir=`dirname $i`
       mkdir -p "$out/$dir"
       cp "$i" "$out/$dir"
-      if echo "$i" | grep -q "^src/"
+      if echo "$i" | grep -v "/bin/" | grep -q "^src/"
       then
          grep -qw `basename "$i"` Makefile || { 
             echo "Missing ref in makefile: $i"
-            touch missing_ref
+            touch "missing_ref"
             exit 1
          }
       fi
    fi
 done
-if [ -e missing_ref ]
+if [ -e "missing_ref" ]
 then
-   rm -f missing_ref
+   rm -f "missing_ref"
    exit 1
 fi
-rm -f "$out-win32.zip" "$out.tar.gz"
-rm "$out/makedist"
-rm "$out/install.bat"
-tar czvpf "$out.tar.gz" "$out"
-cp install.bat "$out"
-cp -a win32/bin "$out"
-cp -a win32/lua5.1 "$out"
-zip -r "$out-win32.zip" "$out"
-rm -rf "$out"
+
+rm -rf "release-unix" "release-windows" "$out.tar.gz" "$out-win32.zip"
+
+mkdir "release-unix"
+cp -a "$out" "release-unix"
+mkdir "release-windows"
+mv "$out" "release-windows/$out-win32"
+
+cd "release-unix/$out"
+rm -rf makedist install.bat COPYING.7z win32 lfw src/bin/rclauncher.c 
+cd ..
+tar czvpf ../"$out.tar.gz" "$out"
+cd ..
+rm -rf "release-unix"
+
+cd "release-windows/$out-win32"
+cp -va win32/* .
+rm -rf makedist Makefile configure lfw win32
+cd ..
+zip -r ../"$out-win32.zip" "$out-win32"
+cd ..
+rm -rf "release-windows"
\ No newline at end of file
diff --git a/rockspec b/rockspec
index 2e916a67..5c054e2f 100644
--- a/rockspec
+++ b/rockspec
@@ -1,5 +1,5 @@
 package = "LuaRocks"
-local VER = "2.0.2"
+local VER = "2.0.3"
 local REV = "1"
 version = VER.."-"..REV
 
diff --git a/src/luarocks/cfg.lua b/src/luarocks/cfg.lua
index 45c73bf6..f76b247c 100644
--- a/src/luarocks/cfg.lua
+++ b/src/luarocks/cfg.lua
@@ -24,7 +24,7 @@ end
 
 _M.config = config
 
-program_version = "2.0.2"
+program_version = "2.0.3"
 user_agent = "LuaRocks/"..program_version
 
 local persist = require("luarocks.persist")