SliTaz Repositories

     1.1 --- a/pkgs.cgi	Thu Apr 14 19:46:48 2011 +0200
     1.2 +++ b/pkgs.cgi	Thu Apr 14 20:08:15 2011 +0200
     1.3 @@ -504,11 +504,11 @@
     1.4  EOT
     1.5  		fi
     1.6  		;;
     1.7 -	*\ config\ *)
     1.8 +	*\ admin\ * )
     1.9  		#
    1.10  		# Tazpkg configuration page
    1.11  		#
    1.12 -		cmd=$(GET config)
    1.13 +		cmd=$(GET admin)
    1.14  		case "$cmd" in
    1.15  			clean)
    1.16  				rm -rf /var/cache/tazpkg/* ;;
    1.17 @@ -527,10 +527,52 @@
    1.18  		cache_size=`du -sh /var/cache/tazpkg`
    1.19  		sidebar
    1.20  		cat << EOT
    1.21 -<h2>`gettext "Configuration"`</h2>
    1.22 +<h2>$(gettext "Administration")</h2>
    1.23  <div>
    1.24 -	<p>`gettext "Tazpkg configuration and settings"`</p>
    1.25 +	<p>$(gettext "Tazpkg administration and settings")</p>
    1.26  </div>
    1.27 +<div id="actions">
    1.28 +	<a class="button" href='$SCRIPT_NAME?admin=&action=saveconf'>
    1.29 +		<img src="$IMAGES/tazpkg.png" />`gettext "Save configuration"`</a>
    1.30 +	<a class="button" href='$SCRIPT_NAME?admin=&action=listconf'>
    1.31 +		<img src="$IMAGES/edit.png" />`gettext "List configuration files"`</a>
    1.32 +	<a class="button" href='$SCRIPT_NAME?admin=&action=quickcheck'>
    1.33 +		<img src="$IMAGES/recharge.png" />`gettext "Quick check"`</a>
    1.34 +	<a class="button" href='$SCRIPT_NAME?admin=&action=fullcheck'>
    1.35 +		<img src="$IMAGES/recharge.png" />`gettext "Full check"`</a>
    1.36 +</div>
    1.37 +EOT
    1.38 +		case "$(GET action)" in
    1.39 +				saveconf)
    1.40 +					LOADING_MSG=$(gettext "Creating the package...")
    1.41 +					loading_msg
    1.42 +					echo "<pre>"
    1.43 +					cd $HOME
    1.44 +					tazpkg repack-config | filter_tazpkg_msgs
    1.45 +					gettext "Path : " && ls $HOME/config-*.tazpkg
    1.46 +					echo "</pre>" ;;
    1.47 +				listconf)
    1.48 +					echo "<h4>`gettext "Configuration files"`</h4>"
    1.49 +					echo "<ul>"
    1.50 +					tazpkg list-config | sed \
    1.51 +				'/^\//!d;s/.*/<li><a href="index.cgi?file=&">&<\/a><\/li>/'
    1.52 +					echo "</ul>"
    1.53 +					echo "</pre>" ;;
    1.54 +				quickcheck)
    1.55 +					LOADING_MSG=$(gettext "Checking packages consitency...")
    1.56 +					loading_msg
    1.57 +					echo "<pre>"
    1.58 +					tazpkg check
    1.59 +					echo "</pre>" ;;
    1.60 +				fullcheck)
    1.61 +					LOADING_MSG=$(gettext "Full packages check...")
    1.62 +					loading_msg
    1.63 +					echo "<pre>"
    1.64 +					tazpkg check --full
    1.65 +					echo "</pre>" ;;
    1.66 +				esac
    1.67 +		cat << EOT
    1.68 +<h3>$(gettext "Packages cache")</h3>
    1.69  <div>
    1.70  	<form method="get" action="$SCRIPT_NAME">
    1.71  		<p>
    1.72 @@ -574,8 +616,8 @@
    1.73  		<img src="$IMAGES/recharge.png" />`gettext "Recharge list"`</a>
    1.74  	<a class="button" href='$SCRIPT_NAME?up'>
    1.75  		<img src="$IMAGES/update.png" />`gettext "Check upgrade"`</a>
    1.76 -	<a class="button" href='$SCRIPT_NAME?config'>
    1.77 -		<img src="$IMAGES/edit.png" />`gettext "Configuration"`</a>	
    1.78 +	<a class="button" href='$SCRIPT_NAME?admin'>
    1.79 +		<img src="$IMAGES/edit.png" />`gettext "Administration"`</a>	
    1.80  </div>
    1.81  <pre class="pre-main">
    1.82  `packages_summary`
    1.83 @@ -586,44 +628,7 @@
    1.84  `tail -n 5 /var/log/tazpkg.log | fgrep "-" | \
    1.85  	awk '{print $1, $2, $3, $4, $5, $6, $7}'`
    1.86  </pre>
    1.87 -
    1.88 -<a name="administration"></a>
    1.89 -<h3>`gettext "Administration"`</h3>
    1.90 -<div id="actions">
    1.91 -	<a class="button" href='$SCRIPT_NAME?action=saveconf#administration'>
    1.92 -		<img src="$IMAGES/tazpkg.png" />`gettext "Save configuration"`</a>
    1.93 -	<a class="button" href='$SCRIPT_NAME?action=listconf#administration'>
    1.94 -		<img src="$IMAGES/edit.png" />`gettext "List configuration files"`</a>
    1.95 -	<a class="button" href='$SCRIPT_NAME?action=quickcheck#administration'>
    1.96 -		<img src="$IMAGES/recharge.png" />`gettext "Quick check"`</a>
    1.97 -	<a class="button" href='$SCRIPT_NAME?action=fullcheck#administration'>
    1.98 -		<img src="$IMAGES/recharge.png" />`gettext "Full check"`</a>
    1.99 -</div>
   1.100 -
   1.101  EOT
   1.102 -		case "$(GET action)" in
   1.103 -		saveconf)
   1.104 -			echo "<pre>"
   1.105 -			cd $HOME
   1.106 -			tazpkg repack-config | sed 's/.\[[^mG]*.//g'
   1.107 -			ls -l $HOME/config-*.tazpkg
   1.108 -			echo "</pre>" ;;
   1.109 -		listconf)
   1.110 -			echo "<h4>`gettext "Configuration files"`</h4>"
   1.111 -			echo "<ul>"
   1.112 -			tazpkg list-config | sed \
   1.113 -		'/^\//!d;s/.*/<li><a href="index.cgi?file=&">&<\/a><\/li>/'
   1.114 -			echo "</ul>"
   1.115 -			echo "</pre>" ;;
   1.116 -		quickcheck)
   1.117 -			echo "<pre>"
   1.118 -			tazpkg check
   1.119 -			echo "</pre>" ;;
   1.120 -		fullcheck)
   1.121 -			echo "<pre>"
   1.122 -			tazpkg check --full
   1.123 -			echo "</pre>" ;;
   1.124 -		esac
   1.125  		;;
   1.126  esac
   1.127