From: Felix Fietkau <nbd@openwrt.org>
Date: Sat, 22 Oct 2005 23:18:10 +0000 (+0000)
Subject: fix version display in info.sh
X-Git-Tag: whiterussian_rc4~82
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=b5ef2415fdb51647d1a710583982954e65c3027e;p=openwrt%2Fsvn-archive%2Fopenwrt.git

fix version display in info.sh

SVN-Revision: 2270
---

diff --git a/openwrt/package/webif/files/www/cgi-bin/webif/info.sh b/openwrt/package/webif/files/www/cgi-bin/webif/info.sh
index 8fb577a3c9..b9ebc075b2 100755
--- a/openwrt/package/webif/files/www/cgi-bin/webif/info.sh
+++ b/openwrt/package/webif/files/www/cgi-bin/webif/info.sh
@@ -2,35 +2,43 @@
 <? 
 . /usr/lib/webif/webif.sh
 header "Info" "Router Info" "Router Info"
+
 ?>
 <pre><?
-
+_version=$( grep "(" /etc/banner )
+_version="${_version%% ---*}"
+_kversion="$( cat /proc/version )"
+_date="$(date)"
+_mac="$(/sbin/ifconfig eth0 | grep HWaddr | cut -b39-)"
 sed -e 's/&/&amp;/g' < /etc/banner
-
-?></pre>
+cat <<EOF
+</pre>
 <br />
 <br />
 <table style="width: 90%; text-align: left;" border="0" cellpadding="2" cellspacing="2" align="center">
 <tbody>
 	<tr>
 		<td>Firmware Version</td>
-		<td><? grep "(" /etc/banner | cut -b-20 | cut -b2- ?></td>
+		<td>$_version</td>
 	</tr>
 	<tr>
 		<td>Kernel Version</td>
-		<td><? cat /proc/version ?></td>
+		<td>$_kversion</td>
 	</tr>
 	<tr>
 		<td>Current Date/Time</td>
-		<td><? date ?></td>
+		<td>$_date</td>
 	</tr>
 	<tr>
 		<td>MAC-Address</td>
-		<td><? /sbin/ifconfig eth0 | grep HWaddr | cut -b39-  ?></td>
+		<td>$_mac</td>
 	</tr>
 </tbody>
 </table>
-<? footer ?>
+EOF
+
+footer
+?>
 <!--
 ##WEBIF:name:Info:2:Router Info
 -->