tazpanel rev 99
move filter_taztools_msgs to lib/libtaz
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Thu Apr 14 21:00:28 2011 +0200 (2011-04-14) |
parents | df959815c470 |
children | bec06e84d6c6 |
files | lib/libtazpanel pkgs.cgi |
line diff
1.1 --- a/lib/libtazpanel Thu Apr 14 20:39:50 2011 +0200 1.2 +++ b/lib/libtazpanel Thu Apr 14 21:00:28 2011 +0200 1.3 @@ -43,10 +43,15 @@ 1.4 esac 1.5 } 1.6 1.7 +# Remove status and ESC char from tazpkg/tazlito commands output 1.8 +filter_taztools_msgs() { 1.9 + grep ^[a-zA-Z0-9] | sed s'/\.*\]//' 1.10 +} 1.11 + 1.12 # LOG activities 1.13 log() { 1.14 date=$(date "+%Y-%m-%d %H:%M") 1.15 - grep ^[a-zA-Z0-9] | sed s'/\.*\]//' | \ 1.16 + filter_taztools_msgs | \ 1.17 sed s"#[^']*#$date : \0#" >> $LOG_FILE 1.18 } 1.19
2.1 --- a/pkgs.cgi Thu Apr 14 20:39:50 2011 +0200 2.2 +++ b/pkgs.cgi Thu Apr 14 21:00:28 2011 +0200 2.3 @@ -48,11 +48,6 @@ 2.4 unset IFS 2.5 } 2.6 2.7 -# Remove status and ESC char from tazpkg commands output 2.8 -filter_tazpkg_msgs() { 2.9 - grep ^[a-zA-Z0-9] | sed s'/\.*\]//' 2.10 -} 2.11 - 2.12 # Display a full summary of packages stats 2.13 packages_summary() { 2.14 gettext "Last recharge : " 2.15 @@ -315,7 +310,7 @@ 2.16 <pre> 2.17 EOT 2.18 gettext "Recharging packages list" | log 2.19 - tazpkg recharge | filter_tazpkg_msgs 2.20 + tazpkg recharge | filter_taztools_msgs 2.21 cat << EOT 2.22 </pre> 2.23 <p> 2.24 @@ -400,7 +395,7 @@ 2.25 for pkg in $pkgs 2.26 do 2.27 echo '<pre>' 2.28 - echo 'y' | tazpkg $cmd $pkg $opt 2>/dev/null | filter_tazpkg_msgs 2.29 + echo 'y' | tazpkg $cmd $pkg $opt 2>/dev/null | filter_taztools_msgs 2.30 echo '</pre>' 2.31 done ;; 2.32 *\ info\ *) 2.33 @@ -548,7 +543,7 @@ 2.34 loading_msg 2.35 echo "<pre>" 2.36 cd $HOME 2.37 - tazpkg repack-config | filter_tazpkg_msgs 2.38 + tazpkg repack-config | filter_taztools_msgs 2.39 gettext "Path : " && ls $HOME/config-*.tazpkg 2.40 echo "</pre>" ;; 2.41 listconf)