# HG changeset patch # User Christophe Lincoln # Date 1488232253 -3600 # Node ID cf6506c8f9ad319d36c932d2fd3f1340e1435058 # Parent 38d6569ce70f8d6b617eb9b2439b6cc9d398da18 Small fix to CGI hub diff -r 38d6569ce70f -r cf6506c8f9ad libsup.sh --- a/libsup.sh Mon Feb 27 22:21:15 2017 +0100 +++ b/libsup.sh Mon Feb 27 22:50:53 2017 +0100 @@ -16,7 +16,7 @@ activity="$cache/activity.log" mirror="http://scn.slitaz.org/content/sup/packages" -pkgsdb="$supdb/packages.db" +pkgsdb="$supdb/packages.sql" wok="$supdb/wok" supcook="$HOME/sup-cook" diff -r 38d6569ce70f -r cf6506c8f9ad server/sup/sup-admin.cgi --- a/server/sup/sup-admin.cgi Mon Feb 27 22:21:15 2017 +0100 +++ b/server/sup/sup-admin.cgi Mon Feb 27 22:50:53 2017 +0100 @@ -38,7 +38,7 @@ Database tables : $(sqlite3 ${pkgsdb} '.tables') Database size : $(du -mh ${pkgsdb} | cut -d " " -f 1) EOT - sqlite3 ${pkgsdb} 'SELECT * FROM info' \ + sqlite3 ${pkgsdb} 'SELECT timestamp FROM info' \ | awk '{printf "Timestamp : %s %s\n",$1,$2 }' echo "" else @@ -47,13 +47,18 @@ # Check/admin wok: remove packagage # - #echo "

Public wok

" - #echo "
"
-		#echo "Checking public wok..."
-		#for pkg in $(ls $content/sup/wok); do
+		echo "
Public wok
"
+		echo "
"
+		echo "Wok path     : $wok"
+		echo "Wok size     : $(du -smh $wok | cut -d "	" -f 1)"
+		echo "Packages     : $(ls $wok | wc -l)"
+		echo "README files : $(find ${wok} -name README -type f | wc -l)"
+		
+		#${wok}/${pkg}/receip
+		#for pkg in $(ls $wok); do
 			#echo "$pkg"
 		#done
-		#echo "
"
+		echo "
" html_footer && exit 0 ;; @@ -80,7 +85,7 @@ create_pkgs_table() { sqlite3 ${pkgsdb} << EOT CREATE TABLE pkgs( - pkg PRIMARY KEY, + name PRIMARY KEY, version, short_desc, maintainer, @@ -152,8 +157,8 @@ # SUP SQLite commands testsuite echo "
"
 				
-				echo "Running: SELECT pkg FROM pkgs LIMIT 4"
-				sqlite3 ${pkgsdb} 'SELECT pkg FROM pkgs LIMIT 4' && newline
+				echo "Running: SELECT name FROM pkgs LIMIT 4"
+				sqlite3 ${pkgsdb} 'SELECT name FROM pkgs LIMIT 4' && newline
 				
 				# .schema
 				echo "CREATE statements"