seb rev 28
Improve web/gui and use new tazweb --small
author | Christophe Lincoln <pankso@slitaz.org> |
---|---|
date | Tue Mar 14 22:05:35 2017 +0100 (2017-03-14) |
parents | cb51498760ab |
children | 6a760d83d976 |
files | seb tools/web/seb.cgi |
line diff
1.1 --- a/seb Mon Mar 13 19:56:17 2017 +0100 1.2 +++ b/seb Tue Mar 14 22:05:35 2017 +0100 1.3 @@ -12,6 +12,8 @@ 1.4 # --iso --work --linux can be set in config file or from cmdline 1.5 [ -f "build.conf" ] && . build.conf 1.6 1.7 +[ "$work" ] || work="$(pwd)" 1.8 + 1.9 rootfs="$work/rootfs" 1.10 rootiso="$work/rootiso" 1.11 sebfs="$work/sebfs" 1.12 @@ -24,7 +26,6 @@ 1.13 initfs="/usr/share/seb/initfs" 1.14 packages="/usr/share/seb/packages" 1.15 1.16 -[ "$work" ] || work="$(pwd)" 1.17 [ "$iso" ] || iso="seb-os-$(date '+%Y%m%d').iso" 1.18 [ "$linux" ] || linux="$tools/bzImage-4.9.13" 1.19 [ "$port" ] || port="8940" 1.20 @@ -467,7 +468,7 @@ 1.21 httpd -p ${port} -u 0:0 -h ${work} \ 1.22 -c ${tools}/web/httpd.conf 1.23 fi 1.24 - tazweb --notoolbar http://localhost:${port}/ & ;; 1.25 + tazweb --small --raw http://localhost:${port}/ & ;; 1.26 1.27 env) 1.28 title "SEB environment"
2.1 --- a/tools/web/seb.cgi Mon Mar 13 19:56:17 2017 +0100 2.2 +++ b/tools/web/seb.cgi Tue Mar 14 22:05:35 2017 +0100 2.3 @@ -10,9 +10,10 @@ 2.4 . /usr/lib/slitaz/httphelper.sh 2.5 header 2.6 2.7 +. /lib/libseb.sh 2.8 work="$(pwd)" 2.9 +packages="/usr/share/seb/packages" 2.10 export output=html 2.11 -. /lib/libseb.sh 2.12 2.13 # Everything preformatted for a cmdline style output 2.14 cat << EOT 2.15 @@ -22,8 +23,8 @@ 2.16 <meta charset="utf-8" /> 2.17 <title>SliTaz Embedded Builder</title> 2.18 <style type="text/css"> 2.19 - h1 { color: #aaa; font-size: 140%; } .info { color: #800057; } 2.20 - hr { border: 1px solid #ddd; } 2.21 + h1 { color: #888; font-size: 140%; } .info { color: #800057; } 2.22 + hr { border: 1px solid #ddd; } .pkg { color: #800057; padding: 0 20px 0 0; } 2.23 </style> 2.24 </head> 2.25 <h1>SliTaz Embedded Builder</h1> 2.26 @@ -41,11 +42,20 @@ 2.27 2.28 *\ help\ *) seb | sed '1,2d' ;; 2.29 *\ build\ *) seb -b ;; 2.30 - *\ packages\ *) seb -p ;; 2.31 *\ emulate\ *) seb -e ;; 2.32 *\ debug\ *) seb env; seb testsuite ;; 2.33 + *\ packages\ *) 2.34 + title "Seb packages" 2.35 + IFS=":" 2.36 + echo "<table>" 2.37 + ls ${packages} | while read pkg; do 2.38 + . ${packages}/${pkg} 2.39 + echo "<tr><td class='pkg'>$pkg</td><td>$desc</td></tr>" 2.40 + done; unset IFS 2.41 + echo "</table><hr />" ;; 2.42 2.43 *) 2.44 + title "Seb summary" 2.45 echo "Work path : <span class='info'>$work</span>" 2.46 if [ -d "$work/rootfs" ]; then 2.47 cat << EOT 2.48 @@ -54,7 +64,7 @@ 2.49 EOT 2.50 else 2.51 echo "Seb OS : Not built yet!" 2.52 - fi ;; 2.53 + fi; footer ;; 2.54 esac 2.55 2.56 cat << EOT