changeset 139:ff2d8ebe1818 misc

Updated.
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 20 Dec 2010 23:36:19 +0000
parents e001efd8d490
children efc7f68f6bb3
files materials/mkalloyinfo.sh materials/mkmaterialinfo.sh
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/materials/mkalloyinfo.sh	Mon Dec 20 21:34:26 2010 +0000
+++ b/materials/mkalloyinfo.sh	Mon Dec 20 23:36:19 2010 +0000
@@ -1,10 +1,11 @@
 #!/bin/sh
+ADDR="ccr@tnsp.org:/var/www/tnsp.org/mat/"
 DESTDIR="."
 ALLOYPHP="$DESTDIR/alloys.inc.php"
 ALLOYTXT="$DESTDIR/alloys.txt"
 
 echo "Fetching alloy submissions ..."
-scp "ccr@tnsp.org:public_html/bat/mat/*.{log,php}" .
+scp -C "$ADDR/*.{log,php}" .
 
 echo "Generating alloy data ..."
 cat ggr_alloys.txt data-*.log > tmp
@@ -13,5 +14,4 @@
 perl -w parsealloys.pl -text < tmp > "$ALLOYTXT"
 
 echo "Uploading ..."
-scp -C "$ALLOYTXT" ccr@tnsp.org:public_html/bat/ &&
-scp -C "$ALLOYPHP" ccr@tnsp.org:public_html/bat/mat/
+scp -C "$ALLOYTXT" "$ALLOYPHP" $ADDR
--- a/materials/mkmaterialinfo.sh	Mon Dec 20 21:34:26 2010 +0000
+++ b/materials/mkmaterialinfo.sh	Mon Dec 20 23:36:19 2010 +0000
@@ -36,4 +36,4 @@
 cat $DATADIR/*.mat | perl -w parsematerial.pl -perl > "$LISTMAT"
 
 echo "Uploading ..."
-scp -C "$LISTLONG" "$LISTSHORT" "$LISTCSV" "$LISTPHP" ccr@tnsp.org:public_html/bat/mat/
+scp -C "$LISTLONG" "$LISTSHORT" "$LISTCSV" "$LISTPHP" ccr@tnsp.org:/var/www/tnsp.org/mat/