Changeset 1120 for trunk/devel/run

Timestamp:

08/04/2012 04:32:05 AM (10 months ago)

Author:

moo

Message:

devel: update run

Files:

• trunk/devel/run (modified) (8 diffs)

trunk/devel/run

@@ -17 +17 @@
 . devel/run.cfg
 if [[ $# -gt 0 ]]; then
-    type=$1
+    action=$1
     shift
     if [[ $# -gt 0 ]]; then
         args=("$@")
-    elif [[ $type = "make" ]]; then
+    elif [[ $action = "make" ]]; then
         args=()
     fi
 fi
 
-case "$type" in
+case "$action" in
 prep*)
     exec $MAKE -f devel/prepare.mak "${args[@]}"
     ;;
 po2php)
-    ./run mergepo
+    ./run mergepo "${args[0]}"
     find htdocs -iname '*.po' | while read -r i; do
         phpfile=${i/.po/.php}
@@ -40 +40 @@
     ;;
 mergepo)
-    ./run prep
+    ./run prep "${args[0]}"
     find htdocs -iname '*.po' | while read -r i; do
         if [[ -f $i-merged ]]; then
@@ -127 +127 @@
 
         pwd
-        $0 "$type" "${args[@]}"
+        $0 "$action" "${args[@]}"
     done
     exit
@@ -137 +137 @@
 pidfile=../$xcachebasename/devel.pid
 
-case "$type" in
+case "$action" in
 phpize)
     if [[ -r Makefile ]]; then
@@ -146 +146 @@
 
 rm -f php-src
-find -L . -type l | xargs rm -fv
+find -L . -action l | xargs rm -fv
 lndir "$xcachesrcdir" >/dev/null || true
 find . -iname .\*.swp | xargs rm -f
@@ -158 +158 @@
 ln -sf ~/src/php/$phpbasename/sapi/fpm/php-fpm php-fpm
 
-case "$type" in
+case "$action" in
 phpize)
     PHPDIRS=${PHPDIRS:-$HOME/test}
@@ -192 +192 @@
 | hi error implicit warn FAIL
 ret=${PIPESTATUS[0]}
-if [[ $ret -ne 0 || $type = make ]]; then
+if [[ $ret -ne 0 || $action = make ]]; then
     exit $ret
 fi
@@ -228 +228 @@
 esac
 
-case "$type" in
+case "$action" in
 ltr*)
     export USE_ZEND_ALLOC=0