Get back PukiWiki original user files

[pukiwiki/pukiwiki_devel.git] / release.sh

diff --git a/release.sh b/release.sh
index f48eab5..56af3ac 100755 (executable)
--- a/release.sh
+++ b/release.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: release.sh,v 1.32 2011/05/30 15:06:56 henoheno Exp $
+# $Id: release.sh,v 1.35 2011/06/05 14:22:51 henoheno Exp $
 # $CVSKNIT_Id: release.sh,v 1.11 2004/05/28 14:26:24 henoheno Exp $
 #  Release automation script for PukiWiki
 #  ==========================================================
@@ -22,6 +22,9 @@ usage(){
   warn  "    -z|--zip    Create *.zip archive"
   warn  "    --move-dist Move *.ini.php => *.ini-dist.php"
   warn  "    --copy-dist Move, and Copy *.ini.php <= *.ini-dist.php"
+  warn  "    --git       Use git repository"
+  warn  "    --repo <repository> Git repository_url"
+  warn  "    --name <distname> package_name"
   return 1
 }
 
@@ -47,7 +50,7 @@ check_versiontag(){
     [1-9].[0-9].[0-9]_[a-z]* | [1-9].[0-9].[0-9][0-9]_[a-z]* ) tag="r$1" ;;
     [1-9].[0-9].[0-9]_[1-9]  | [1-9].[0-9].[0-9][0-9]_[1-9]  ) tag="r$1" ;;
     [1-9].[0-9].[0-9]_[1-9]_[a-z]*  | [1-9].[0-9].[0-9][0-9]_[1-9]_[a-z]*  ) tag="r$1" ;;
-    HEAD | r1_3_3_branch ) tag="$rel" ;;
+    HEAD | r1_3_3_branch | branch_r* ) tag="$rel" ;;
     '' ) usage ; return 1 ;;
      * ) warn "Error: Invalid string: $1" ; usage ; return 1 ;;
   esac
@@ -88,6 +91,9 @@ getopt(){ _arg=noarg
   --copy-dist  ) echo _copy_dist 1 ;;
   --move-dist  ) echo _move_dist 1 ;;
   -d  ) echo _CVSROOT 2 ; _arg="$2" ;;
+  --git ) echo _git 1 ;;
+  --repo ) echo _gitrepo 2 ; _arg="$2" ;;
+  --name ) echo _pkg_name 2 ; _arg="$2" ;;
   -*  ) warn "Error: Unknown option \"$1\"" ; return 1 ;;
    *  ) echo OTHER ;;
   esac
@@ -114,6 +120,8 @@ while [ $# -gt 0 ] ; do
      _help   ) usage     ;;
 
      _CVSROOT) CVSROOT="$2" ;;
+     _gitrepo) gitrepo="$2" ;;
+     _pkg_name) pkg_name="$2" ;;
 
      _*      ) eval "_$ch"=on ;;
       *      ) break 2   ;;
@@ -170,15 +178,19 @@ fi > /dev/null
 # Argument check --------------------------------------------
 
 rel="$1"
-tag="` check_versiontag "$rel" `" || exit 1
-pkg_dir="${mod}-${rel}"
 
-if [ "$__utf8" ] ; then
-  pkg_dir="${pkg_dir}_utf8"
+if [ "$pkg_name" ] ; then
+  pkg_dir="$pkg_name"
+  tag="$rel"
+else
+  tag="` check_versiontag "$rel" `" || exit 1
+  pkg_dir="${mod}-${rel}"
+  if [ "$__utf8" ] ; then
+    pkg_dir="${pkg_dir}_utf8"
+  fi
 fi
 
 # Export the module -----------------------------------------
-
 test ! -d "$pkg_dir" || err "There's already a directory: $pkg_dir"
 
 if [ -z "$__checkout" ]
@@ -186,24 +198,57 @@ then cmd="export"
 else cmd="checkout"
 fi
 
-echo cvs -z3 -d "$CVSROOT" -q "$cmd" -r "$tag" -d "$pkg_dir" "$mod"
-     cvs -z3 -d "$CVSROOT" -q "$cmd" -r "$tag" -d "$pkg_dir" "$mod"
+if [ "$__git" ] ; then
+  echo git clone "$gitrepo" "$pkg_dir"
+       git clone "$gitrepo" "$pkg_dir"
+  echo cd $pkg_dir 
+  cd $pkg_dir 
+  echo git reset --hard "$tag"
+       git reset --hard "$tag"
+
+  # Set file timestamp
+  for FILE in $(git ls-files); do
+    TIME=$(git log --pretty=format:%ci -n1 $FILE)
+    echo $TIME'\t'$FILE
+    STAMP=$(date -d "$TIME" +"%y%m%d%H%M.%S")
+    touch -t $STAMP $FILE
+  done
+
+  cd ..
+else
+  exit
+  echo cvs -z3 -d "$CVSROOT" -q "$cmd" -r "$tag" -d "$pkg_dir" "$mod"
+       cvs -z3 -d "$CVSROOT" -q "$cmd" -r "$tag" -d "$pkg_dir" "$mod"
+fi
 
 test   -d "$pkg_dir" || err "There isn't a directory: $pkg_dir"
 
 # Remove '.cvsignore' if exists -----------------------------
 test -z "$__noremove" && {
+  if [ "$__git" ] ; then
+    echo rm -rf "$pkg_dir/.git"
+         rm -rf "$pkg_dir/.git"
+  fi
   echo find "$pkg_dir" -type f -name '.cvsignore' "| xargs rm -f"
        find "$pkg_dir" -type f -name '.cvsignore' | xargs rm -f
 }
 
+# Get back original files ----------------------------------
+mv $pkg_dir/wiki/_526563656E744368616E676573.txt $pkg_dir/wiki/526563656E744368616E676573.txt
+mv $pkg_dir/cache/_recent.dat $pkg_dir/cache/recent.dat
+
+
+
 # Conversion ------------------------------------------------
 
 if [ "$__utf8" ] ; then
   echo "Converting EUC-JP => UTF-8 ..."
   find "$pkg_dir" -type f \( -name "*.txt" -or -name "*.php" -or -name "*.lng"  -or -name "*.dat" -or -name "*.ref" \) |
   while read line; do
-    convert "$line"
+    case "$line" in
+      "$pkg_dir"/zh-CN.lng.php ) ;; # UTF-8 already, Do nothing
+      * ) convert "$line" ;;
+    esac
   done
 
   # Replace 'EUC-JP' => 'UTF-8'