Changeset 2836

Timestamp:

01/07/12 08:07:25 (4 months ago)

Author:

paparazzia

Message:

* prise en charge de $VLMGSHHSURL pour rapatrier les fichiers depuis
testing si possible (see #619)
* ne dezippe que les fichiers necessaires

Location:

trunk

Files:

• hosting/UPGRADE (modified) (1 diff)
• hosting/conf/conf_script.dist (modified) (1 diff)
• hosting/scripts/maj_module.sh (modified) (1 diff)
• hosting/scripts/upgrades.d/up-0.19-0.sh (modified) (1 diff)
• maps/init-gshhs.sh (modified) (2 diffs)

trunk/hosting/UPGRADE

@@ -9 +9 @@
   EDIT file ./conf/conf_script 
     - change VLM SVNBRANCH to V_0_19
+    - add "export VLMGSHHSURL=http://testing.virtual-loup-de-mer.org/gshhs/"
 
   RUN

trunk/hosting/conf/conf_script.dist

@@ -53 +53 @@
 export VLM_GRIB_MAX_TIME=24
 
+#Pas de mail par défaut en cas d'echouage
 export MAIL_FOR_COASTCROSSING=false
+
+#URL de récupération des fichiers gshhs
+export VLMGSHHSURL=http://testing.virtual-loup-de-mer.org/gshhs/
 
 ##########################################

trunk/hosting/scripts/maj_module.sh

@@ -80 +80 @@
     else 
         echo "+$confmodule: Download des fichiers poly, rivers et borders"
-        wget --output-document="$VLMTEMP/poly-f-1.dat" "http://dev.virtual-loup-de-mer.org/datas/poly-f-1.dat"
+        wget --output-document="$VLMTEMP/poly-f-1.dat" "$VLMGSHHSURL/poly-f-1.dat"
         echo -n "+$confmodule: copie dans  $VLMGSHHS..."
         mv "$VLMTEMP/poly-f-1.dat" "$VLMGSHHS/"
         echo 'OK !'
-        wget --output-document="$VLMTEMP/rivers-f-1.dat" "http://dev.virtual-loup-de-mer.org/datas/rivers-f-1.dat"
+        wget --output-document="$VLMTEMP/rivers-f-1.dat" "$VLMGSHHSURL/rivers-f-1.dat"
         echo -n "+$confmodule: copie dans  $VLMGSHHS..."
         mv "$VLMTEMP/rivers-f-1.dat" "$VLMGSHHS/"
         echo 'OK !'
-        wget --output-document="$VLMTEMP/borders-f-1.dat" "http://dev.virtual-loup-de-mer.org/datas/borders-f-1.dat"
+        wget --output-document="$VLMTEMP/borders-f-1.dat" "$VLMGSHHSURL/borders-f-1.dat"
         echo -n "+$confmodule: copie dans  $VLMGSHHS..."
         mv "$VLMTEMP/borders-f-1.dat" "$VLMGSHHS/"
         echo 'OK !'
-        wget --output-document="$VLMTEMP/ETOPO1_Ice.dat" "http://dev.virtual-loup-de-mer.org/datas/ETOPO1_Ice.dat"
+        wget --output-document="$VLMTEMP/ETOPO1_Ice.dat" "$VLMGSHHSURL/ETOPO1_Ice.dat"
         echo -n "+$confmodule: copie dans  $VLMGSHHS..."
         mv "$VLMTEMP/ETOPO1_Ice.dat" "$VLMGSHHS/"

trunk/hosting/scripts/upgrades.d/up-0.19-0.sh

@@ -3 +3 @@
 #do what can be done before maintenance mode
 $VLMRACINE/scripts/maj_module.sh base
+$VLMRACINE/scripts/maj_module.sh maps
 
-

trunk/maps/init-gshhs.sh

@@ -5 +5 @@
 
 destpath=$VLMGSHHS
-gshhsfile=gshhs_2.1.1.zip
-urlgshhs=http://www.ngdc.noaa.gov/mgg/shorelines/data/gshhs/version2.1.1/$gshhsfile
+gshhsfile=gshhs+wdbii_2.2.0.zip
+if test -n "$VLMGSHHSURL" ; then
+    urlgshhs=$VLMGSHHSURL/$gshhsfile
+else    
+    urlgshhs=http://www.ngdc.noaa.gov/mgg/shorelines/data/gshhs/version2.2.0/$gshhsfile
+fi
 
 mkdir -p $destpath
@@ -16 +20 @@
     rm -Rf $VLMTEMP/$gshhsfile
     wget --output-document=$VLMTEMP/$gshhsfile $urlgshhs
-    unzip -j $VLMTEMP/$gshhsfile -d $destpath/
+    unzip -u -j $VLMTEMP/$gshhsfile -d $destpath/
+    mv $VLMTEMP/$gshhsfile $destpath/
 fi