Juan Jose Pablos wrote on 19/02/10 00:41:
> jul escribió:
> 
>> I look for a way to say to 'prepare' script, don't download this stuff
>> because it's useless here.
> 
> try
> rm winxpsp*.bat
> 
> if you do not use svn. should be fine.
> 

I use svn. looking for a more cleaner solution :)

for now, what I do (and did before) is adding to prepare a
test/validation. see joined patch update with latest svn trunk of the
script.

also add a  --no-check-certificate for https self-signed server.


while re-testing my patch, it failed to download openoffice

--2010-02-20 17:53:17--
http://openoffice.bouncer.osuosl.org/?product=OpenOffice.org&os=win&lang=fr&version=3.2
Resolving openoffice.bouncer.osuosl.org... 140.211.167.212
Connecting to openoffice.bouncer.osuosl.org|140.211.167.212|:80...
connected.
HTTP request sent, awaiting response... 302 Found
Location: ./download.php [following]
--2010-02-20 17:53:17--  http://openoffice.bouncer.osuosl.org/download.php
Connecting to openoffice.bouncer.osuosl.org|140.211.167.212|:80...
connected.
HTTP request sent, awaiting response... 200 OK
Length: 3111 (3.0K) [text/html]
Saving to:
`packages/openoffice/ooo_3.2_win32intel_install_fra.exe.25066.tmp'

     0K ...                                                   100% 7.05M=0s

2010-02-20 17:53:19 (7.05 MB/s) -
`packages/openoffice/ooo_3.2_win32intel_install_fra.exe.25066.tmp' saved
[3111/3111]

get html file.
in browser, got: http://openoffice.bouncer.osuosl.org/download.php

this file seems to fail too:
http://extensions.services.openoffice.org/files/297/0/Sun_ODF_Template_Pack_fr.oxt

--2010-02-20 17:55:00--
http://extensions.services.openoffice.org/files/297/0/Sun_ODF_Template_Pack_fr.oxt
Resolving extensions.services.openoffice.org... 140.211.166.72
Connecting to extensions.services.openoffice.org|140.211.166.72|:80...
connected.
HTTP request sent, awaiting response... 301 Moved Permanently
Location:
http://extensions.services.openoffice.org:8080/e-files/297/0/Sun_ODF_Template_Pack_fr.oxt
[following]
--2010-02-20 17:55:01--
http://extensions.services.openoffice.org:8080/e-files/297/0/Sun_ODF_Template_Pack_fr.oxt
Connecting to extensions.services.openoffice.org|140.211.166.72|:8080...
failed: Connection timed out.
Resolving extensions.services.openoffice.org... 140.211.166.72
Connecting to extensions.services.openoffice.org|140.211.166.72|:8080...
failed: Connection timed out.
Retrying.



Thanks for the feedback Juan
Index: prepare
===================================================================
--- prepare     (revision 3173)
+++ prepare     (working copy)
@@ -1,4 +1,5 @@
 #!/bin/bash
+umask 022
 
 # Change to the scripts directory so paths are correct
 cd "$(dirname "$0")"/..
@@ -12,6 +13,9 @@
 
 for cmdfile in `egrep -lri "URL\|($WINLANG|ALL)" scripts/*.bat`; do
 
+  test=`echo $cmdfile | egrep 
'scripts/(win2k|winxp|ws2k3|office2k|officexp|office2003)' |wc -l`
+  if [ $test == 0 ] ; then
+
   echo Processing $cmdfile
 
   # Look for URL|LANG in scripts/ + second arg
@@ -26,9 +30,18 @@
       fi
       # Make sure path is available
       mkdir -p "$path"
+
+      ## ignore some system update and ask for manual validation for others
+      if [ ! -f "$file" ] ; then
+      echo "file $file. download ? (y/n)"
+      read ret
+#ret=y
+      fi
+
       # Download file if it doesn't exist
-      if [ ! -f "$file" ] ; then
-          if wget $SPIDER $WGET_OPS --passive-ftp -O "$file.$$.tmp" "$url" ; 
then
+      if [ ! -f "$file" -a X$ret == "Xy" ] ; then
+#      if [ ! -f "$file" ] ; then
+          if wget $SPIDER $WGET_OPS --passive-ftp --no-check-certificate -q -O 
"$file.$$.tmp" "$url" ; then
               mv "$file.$$.tmp" "$file"
           else
               rm -f "$file.$$.tmp"
@@ -38,4 +51,6 @@
       fi
   done
 
+  fi
+
 done
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
unattended-info mailing list
unattended-info@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/unattended-info

Reply via email to