tazpkg diff pkgs.cgi @ rev 700
/etc/slitaz/slitaz.conf tells that $LOCALSTATE is an OLD variable and equals to $PKGS_DB, so change code.
author | Aleksej Bobylev <al.bobylev@gmail.com> |
---|---|
date | Thu Dec 04 01:41:59 2014 +0200 (2014-12-04) |
parents | c82b727d2012 |
children | 1ab24812ad7e |
line diff
1.1 --- a/pkgs.cgi Wed Nov 19 17:15:05 2014 +0100 1.2 +++ b/pkgs.cgi Thu Dec 04 01:41:59 2014 +0200 1.3 @@ -26,8 +26,8 @@ 1.4 1.5 i18n_desc() { 1.6 # Display localized short description 1.7 - if [ -e "$LOCALSTATE/packages-desc.$LANG" ]; then 1.8 - LOCDESC=$(grep -e "^$pkg " $LOCALSTATE/packages-desc.$LANG | cut -d' ' -f2) 1.9 + if [ -e "$PKGS_DB/packages-desc.$LANG" ]; then 1.10 + LOCDESC=$(grep -e "^$pkg " $PKGS_DB/packages-desc.$LANG | cut -d' ' -f2) 1.11 [ "x$LOCDESC" != "x" ] && SHORT_DESC="$LOCDESC" 1.12 fi 1.13 } 1.14 @@ -61,9 +61,9 @@ 1.15 <tbody> 1.16 <tr><td>$(gettext 'Last recharge:')</td> 1.17 EOT 1.18 - stat=$(stat -c %y $LOCALSTATE/packages.list | \ 1.19 + stat=$(stat -c %y $PKGS_DB/packages.list | \ 1.20 sed 's/\(:..\):.*/\1/' | awk '{print $1}') 1.21 - mtime=$(find $LOCALSTATE/packages.list -mtime +10) 1.22 + mtime=$(find $PKGS_DB/packages.list -mtime +10) 1.23 echo -n "<td>$stat " 1.24 if [ "$mtime" ]; then 1.25 gettext '(Older than 10 days)'; echo 1.26 @@ -75,13 +75,13 @@ 1.27 <tr><td>$(gettext 'Installed packages:')</td> 1.28 <td>$(ls $INSTALLED | wc -l)</td></tr> 1.29 <tr><td>$(gettext 'Mirrored packages:')</td> 1.30 - <td>$(cat $LOCALSTATE/packages.list | wc -l)</td></tr> 1.31 + <td>$(cat $PKGS_DB/packages.list | wc -l)</td></tr> 1.32 <tr><td>$(gettext 'Upgradeable packages:')</td> 1.33 - <td>$(cat $LOCALSTATE/packages.up | wc -l)</td></tr> 1.34 + <td>$(cat $PKGS_DB/packages.up | wc -l)</td></tr> 1.35 <tr><td>$(gettext 'Installed files:')</td> 1.36 <td>$(cat $INSTALLED/*/files.list | wc -l)</td></tr> 1.37 <tr><td>$(gettext 'Blocked packages:')</td> 1.38 - <td>$(cat $LOCALSTATE/blocked-packages.list | wc -l)</td></tr> 1.39 + <td>$(cat $PKGS_DB/blocked-packages.list | wc -l)</td></tr> 1.40 </tbody> 1.41 </table> 1.42 EOT 1.43 @@ -107,7 +107,7 @@ 1.44 1.45 # Parse repositories list to be able to have an icon and remove link 1.46 list_repos() { 1.47 - ls $LOCALSTATE/undigest 2> /dev/null | while read repo ; do 1.48 + ls $PKGS_DB/undigest 2> /dev/null | while read repo ; do 1.49 cat <<EOT 1.50 <li><a href="$SCRIPT_NAME?admin=rm-repo=$repo"> 1.51 <img src="$IMAGES/clear.png">$repo</a></li> 1.52 @@ -174,13 +174,13 @@ 1.53 <a class="active_extra" href="$SCRIPT_NAME?cat=extra&repo=$repo">$(gettext 'extra')</a> 1.54 EOT 1.55 1.56 - if [ -d $LOCALSTATE/undigest ]; then 1.57 + if [ -d $PKGS_DB/undigest ]; then 1.58 [ -n "$category" ] || category="base-system" 1.59 cat << EOT 1.60 <h4>$(gettext 'Repositories')</h4> 1.61 <a class="repo_Public" href="$SCRIPT_NAME?repo=Public&cat=$category">$(gettext 'Public')</a> 1.62 EOT 1.63 - for i in $(ls $LOCALSTATE/undigest); do 1.64 + for i in $(ls $PKGS_DB/undigest); do 1.65 cat << EOT 1.66 <a class="repo_$i" href="$SCRIPT_NAME?repo=$i&cat=$category">$i</a> 1.67 EOT 1.68 @@ -193,23 +193,23 @@ 1.69 } 1.70 1.71 repo_list() { 1.72 - if [ -n "$(ls $LOCALSTATE/undigest/ 2> /dev/null)" ]; then 1.73 + if [ -n "$(ls $PKGS_DB/undigest/ 2> /dev/null)" ]; then 1.74 case "$repo" in 1.75 Public) ;; 1.76 - ""|Any) for i in $LOCALSTATE/undigest/* ; do 1.77 + ""|Any) for i in $PKGS_DB/undigest/* ; do 1.78 [ -d "$i" ] && echo "$i$1" 1.79 done ;; 1.80 - *) echo "$LOCALSTATE/undigest/$repo$1" 1.81 + *) echo "$PKGS_DB/undigest/$repo$1" 1.82 return ;; 1.83 esac 1.84 fi 1.85 - echo "$LOCALSTATE$1" 1.86 + echo "$PKGS_DB$1" 1.87 } 1.88 1.89 repo_name() { 1.90 case "$1" in 1.91 - $LOCALSTATE) echo "Public" ;; 1.92 - $LOCALSTATE/undigest/*) echo ${1#$LOCALSTATE/undigest/} ;; 1.93 + $PKGS_DB) echo "Public" ;; 1.94 + $PKGS_DB/undigest/*) echo ${1#$PKGS_DB/undigest/} ;; 1.95 esac 1.96 } 1.97 1.98 @@ -257,7 +257,7 @@ 1.99 # Use default tazpkg icon since all packages displayed are 1.100 # installed 1.101 colorpkg=$pkg 1.102 - grep -qs "^$pkg$" $LOCALSTATE/blocked-packages.list && 1.103 + grep -qs "^$pkg$" $PKGS_DB/blocked-packages.list && 1.104 colorpkg="<span style='color: red;'>$pkg</span>" 1.105 i18n_desc 1.106 cat << EOT 1.107 @@ -310,7 +310,7 @@ 1.108 $(table_head) 1.109 <tbody> 1.110 EOT 1.111 - target=$(readlink $LOCALSTATE/fslink) 1.112 + target=$(readlink $PKGS_DB/fslink) 1.113 for pkg in $(ls $target/$INSTALLED) 1.114 do 1.115 [ -s $pkg/receipt ] && continue 1.116 @@ -342,7 +342,7 @@ 1.117 # List all available packages by category on mirror. Listing all 1.118 # packages is too resource intensive and not useful. 1.119 # 1.120 - cd $LOCALSTATE 1.121 + cd $PKGS_DB 1.122 repo=$(GET repo) 1.123 category=$(GET cat) 1.124 [ "$category" == "cat" ] && category="base-system" 1.125 @@ -405,7 +405,7 @@ 1.126 # 1.127 pkg=$(GET search) 1.128 repo=$(GET repo) 1.129 - cd $LOCALSTATE 1.130 + cd $PKGS_DB 1.131 search_form 1.132 sidebar | sed "s/repo_$repo/active/" 1.133 LOADING_MSG="$(gettext 'Searching packages...')" 1.134 @@ -514,7 +514,7 @@ 1.135 # 1.136 # Upgrade packages 1.137 # 1.138 - cd $LOCALSTATE 1.139 + cd $PKGS_DB 1.140 search_form 1.141 sidebar 1.142 LOADING_MSG="$(gettext 'Checking for upgrades...')" 1.143 @@ -546,8 +546,8 @@ 1.144 EOT 1.145 for pkg in `cat packages.up` 1.146 do 1.147 - grep -hs "^$pkg |" $LOCALSTATE/packages.desc \ 1.148 - $LOCALSTATE/undigest/*/packages.desc | \ 1.149 + grep -hs "^$pkg |" $PKGS_DB/packages.desc \ 1.150 + $PKGS_DB/undigest/*/packages.desc | \ 1.151 parse_packages_desc 1.152 done 1.153 cat << EOT 1.154 @@ -576,7 +576,7 @@ 1.155 LOADING_MSG="get-installing packages..." 1.156 ;; 1.157 link) 1.158 - opt=$(readlink $LOCALSTATE/fslink) 1.159 + opt=$(readlink $PKGS_DB/fslink) 1.160 LOADING_MSG="linking packages..." 1.161 ;; 1.162 esac 1.163 @@ -623,7 +623,7 @@ 1.164 action="Remove" 1.165 action_i18n=$(gettext 'Remove') 1.166 else 1.167 - cd $LOCALSTATE 1.168 + cd $PKGS_DB 1.169 LOADING_MSG=$(gettext 'Getting package info...') 1.170 loading_msg 1.171 IFS='|' 1.172 @@ -654,7 +654,7 @@ 1.173 fi 1.174 1.175 if [ -d $INSTALLED/$pkg ]; then 1.176 - if grep -qs "^$pkg$" $LOCALSTATE/blocked-packages.list; then 1.177 + if grep -qs "^$pkg$" $PKGS_DB/blocked-packages.list; then 1.178 cat << EOT 1.179 <a class="button" href="$SCRIPT_NAME?do=Unblock&$pkg">$(gettext 'Unblock')</a> 1.180 EOT 1.181 @@ -759,7 +759,7 @@ 1.182 add-repo) 1.183 # Decode url 1.184 mirror=$(GET mirror) 1.185 - repository=$LOCALSTATE/undigest/$(GET repository) 1.186 + repository=$PKGS_DB/undigest/$(GET repository) 1.187 case "$mirror" in 1.188 http://*|ftp://*) 1.189 mkdir -p $repository 1.190 @@ -768,13 +768,13 @@ 1.191 esac ;; 1.192 rm-repo=*) 1.193 repository=${cmd#rm-repo=} 1.194 - rm -rf $LOCALSTATE/undigest/$repository ;; 1.195 + rm -rf $PKGS_DB/undigest/$repository ;; 1.196 esac 1.197 [ "$cmd" == "$(gettext 'Set link')" ] && 1.198 [ -d "$(GET link)/$INSTALLED" ] && 1.199 - ln -fs $(GET link) $LOCALSTATE/fslink 1.200 + ln -fs $(GET link) $PKGS_DB/fslink 1.201 [ "$cmd" == "$(gettext 'Remove link')" ] && 1.202 - rm -f $LOCALSTATE/fslink 1.203 + rm -f $PKGS_DB/fslink 1.204 cache_files=`find /var/cache/tazpkg -name *.tazpkg | wc -l` 1.205 cache_size=`du -sh /var/cache/tazpkg` 1.206 sidebar 1.207 @@ -848,10 +848,10 @@ 1.208 1.209 <h3>$(gettext 'Current mirror list')</h3> 1.210 EOT 1.211 - for i in $LOCALSTATE/mirrors $LOCALSTATE/undigest/*/mirrors; do 1.212 + for i in $PKGS_DB/mirrors $PKGS_DB/undigest/*/mirrors; do 1.213 [ -s $i ] || continue 1.214 echo '<div class="box">' 1.215 - if [ $i != $LOCALSTATE/mirrors ]; then 1.216 + if [ $i != $PKGS_DB/mirrors ]; then 1.217 Repo_Name="$(repo_name $(dirname $i))" 1.218 echo "<h4>$(eval_gettext 'Repository: $Repo_Name')</h4>" 1.219 fi 1.220 @@ -871,7 +871,7 @@ 1.221 EOT 1.222 done 1.223 echo "<h3>$(gettext 'Private repositories')</h3>" 1.224 - [ -n "$(ls $LOCALSTATE/undigest 2> /dev/null)" ] && cat << EOT 1.225 + [ -n "$(ls $PKGS_DB/undigest 2> /dev/null)" ] && cat << EOT 1.226 <div class="box"> 1.227 <ul> 1.228 $(list_repos) 1.229 @@ -898,7 +898,7 @@ 1.230 <p> 1.231 <input type="hidden" name="admin" value="add-link" /> 1.232 <input type="text" name="link" 1.233 - value="$(readlink $LOCALSTATE/fslink 2> /dev/null)" size="50"> 1.234 + value="$(readlink $PKGS_DB/fslink 2> /dev/null)" size="50"> 1.235 <input type="submit" name="admin" value="$(gettext 'Set link')" /> 1.236 <input type="submit" name="admin" value="$(gettext 'Remove link')" /> 1.237 </p> 1.238 @@ -969,7 +969,7 @@ 1.239 <a class="button" href="$SCRIPT_NAME?list"> 1.240 <img src="$IMAGES/tazpkg.png" />$(gettext 'My packages')</a> 1.241 EOT 1.242 - fslink=$(readlink $LOCALSTATE/fslink) 1.243 + fslink=$(readlink $PKGS_DB/fslink) 1.244 [ -n "$fslink" -a -d "$fslink/$INSTALLED" ] && 1.245 cat << EOT 1.246 <a class="button" href="$SCRIPT_NAME?linkable">