Changeset 25

Show
Ignore:
Timestamp:
03/14/07 16:13:10 (2 years ago)
Author:
Trellmor
Message:

Autoupdate branches auswählbar gemacht, gewaehler branch wird auch angezeigt, wenn keine verbindung besteht

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/usr/lib/webif/form.awk

    r22 r25  
    256256        print("<select id=\"" $2 "\" valign=\"middle\" name=\"" $2 "\" class=\"" $4 "\">");  
    257257        print("<option value=\"stable\""); if( $3 == "stable" ) print(" selected=\"selcted\""); print(">stable</option>"); 
     258        # We prolly don't have a connection, so print the selected one if it's not stable 
     259        if ( $5 == "" && $3 != "stable" ) { 
     260                print("<option value=\"" $3 "\" selected=\"selected\">" $3 "</option>"); 
     261        } 
    258262        for(i = 5; $(i) != ""; i++) { 
    259263                print("<option value=\"" $(i) "\""); if ( $(i) == $3 ) printf(" selected=\"selected\""); printf(">" $(i) "</option>"); 

  • trunk/www/cgi-bin/webif/autoupdate.sh

    r24 r25  
    6969        echo "@TR<<Installed version:>> $instversion<br/>" 
    7070         
    71         if ping -c 1 "$(echo $url|awk -F/ '{print $3}')" > /dev/null; then 
     71        if ping -c 1 "$(echo $url|awk -F/ '{print $3}')" > /dev/null 2> /dev/null; then 
    7272                if wget -q -O /dev/null $url/$FORM_branch/$instversion/install.sh 2> /dev/null; then 
    7373                        echo "@TR<<Updates available>><br/>";