merge r4668 from branch 2.0 to trunk

feature 1375: remove version in Piwigo archive root directory


git-svn-id: http://piwigo.org/svn/trunk@4669 68402e56-0260-453c-a942-63ccdbb3a9ee

1 files changed, 7 insertions, 28 deletions

diff --git a/tools/pwg_rel_create.sh b/tools/pwg_rel_create.sh
index 424b703d9..a24033309 100755
--- a/tools/pwg_rel_create.sh
+++ b/tools/pwg_rel_create.sh
@@ -21,41 +21,20 @@ version=$2
 name=piwigo-$version
 
 cd /tmp
-if [ -e $name ]
-then
-  rm -rf $name
-fi
 
 if [ -e $version ]
 then
   rm -rf $version
 fi
 mkdir $version
+cd $version
+
+svn export http://piwigo.org/svn/tags/$tag piwigo
 
-# cvs export -r $tag -d $version phpwebgallery
-svn export http://piwigo.org/svn/tags/$tag $name
 # creating config_database.inc.php empty and writeable
-touch $name/include/config_database.inc.php
-chmod a+w $name/include/config_database.inc.php
+touch piwigo/include/config_database.inc.php
+chmod a+w piwigo/include/config_database.inc.php
 
-# find $name -name "*.php" \
-#   | xargs grep -l 'branch 1.7' \
-#   | xargs perl -pi -e "s/branch 1.7/${version}/g"
+zip -r $name.zip piwigo
 
-cd /tmp
-for ext in zip # tar.gz tar.bz2
-do
-  file=$version/$name.$ext
-  if [ -f $file ]
-  then
-    rm $name
-  fi
-done
-
-
-zip -r   $version/$name.zip     $name
-# tar -czf $version/$name.tar.gz  $name
-# tar -cjf $version/$name.tar.bz2 $name
-
-cd /tmp/$version
-# md5sum p* >MD5SUMS
+echo cd /tmp/$version