[CVS] scripts config,1.1.1.1,1.2 sync-file,1.1.1.1,1.2 templates-sync,1.1.1.1,1.2
Update of /cvsroot/l10n-russian/scripts
In directory quantz:/tmp/cvs-serv28980
Modified Files:
config sync-file templates-sync
Log Message:
Sync to real ones on alioth
Index: templates-sync
===================================================================
RCS file: /cvsroot/l10n-russian/scripts/templates-sync,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- templates-sync 21 Jan 2004 09:10:40 -0000 1.1.1.1
+++ templates-sync 21 Jan 2004 11:02:56 -0000 1.2
@@ -15,16 +15,18 @@
fi
cd $MODULE_NAME/$MODULE_NAME
- CVS_OUT=`$CVS $CVS_DRY_ARGS $CVS_ARGS update $CVS_UPDATE_ARGS 2>&1`
- NEW_DIRS=`echo "$CVS_OUT" | grep 'New directory' | sed 's/cvs server: New directory .//' | sed 's/. -- ignored//'`
+ NEW_DIRS=`$CVS $CVS_DRY_ARGS $CVS_ARGS update $CVS_UPDATE_ARGS 2>&1 | grep 'New directory' | sed 's/cvs server: New directory .//' | sed 's/. -- ignored//'`
for DIR in $NEW_DIRS ; do
- CVS_OUT1=`$CVS $CVS_ARGS update $CVS_UPDATE_ARGS $DIR`
+ CVS_OUT1=`$CVS $CVS_ARGS update $CVS_UPDATE_ARGS $DIR 2>&1 | grep '\.pot' | sed 's/U //'`
CVS_OUT2=`echo "$CVS_OUT" | echo "CVS_OUT1"`
CVS_OUT="$CVS_OUT2"
done
- POT_FILES=`echo $CVS_OUT | grep '\.pot' | sed 's/[UP] //'`
+
+ CVS_OUT1=`$CVS $CVS_DRY_ARGS $CVS_ARGS update $CVS_UPDATE_ARGS 2>&1 | grep '\.pot' | sed 's/[UP] //'`
+ POT_FILES=`echo $CVS_OUT1 $CVS_OUT`
cd ..
+
for POT_FILE in $POT_FILES ; do
. $SYNC_FILE $MODULE_NAME $POT_FILE $SUFFIX
done
Index: config
===================================================================
RCS file: /cvsroot/l10n-russian/scripts/config,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- config 21 Jan 2004 09:10:40 -0000 1.1.1.1
+++ config 21 Jan 2004 11:02:56 -0000 1.2
@@ -17,9 +17,6 @@
# Args to update
CVS_UPDATE_ARGS="-dPA"
-# Args to commit
-CVS_COMMIT_ARGS='-m "This is autocommit by script in order to sync with upstream templates"'
-
# Commands
CVS_UPDATE_CMD="update"
CVS_COMMIT_CMD="commit"
Index: sync-file
===================================================================
RCS file: /cvsroot/l10n-russian/scripts/sync-file,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- sync-file 21 Jan 2004 09:10:40 -0000 1.1.1.1
+++ sync-file 21 Jan 2004 11:02:56 -0000 1.2
@@ -16,7 +16,7 @@
echo "Updating $FILE_NAME"
-POT=$MODULE_NAME"_"`echo $FILE_NAME | sed s|/|_|g | sed s/$SUFFIX/ru/`
+POT=$MODULE_NAME"_"`echo $FILE_NAME | sed 's|/|_|g' | sed s/$SUFFIX/ru/`
PO=`echo $POT | sed s/\.pot/\.po/`
if [ -e l10n-russian/$PO ]; then
@@ -45,6 +45,6 @@
fi
cd l10n-russian
-$CVS $CVSARGS commit $CVS_COMMIT_ARGS $PO
+$CVS $CVSARGS commit -m "This is autocommit by script in order to sync with upstream templates" $PO
cd ..
Reply to: