# HG changeset patch # User Aleksej Bobylev # Date 1417650119 -7200 # Node ID 1d7f3c9ce99c7e59c4029b34e58668a138c00eaf # Parent 1b791f0f9239bf3cdbf3604b6d0980515f6b45b6 /etc/slitaz/slitaz.conf tells that $LOCALSTATE is an OLD variable and equals to $PKGS_DB, so change code. diff -r 1b791f0f9239 -r 1d7f3c9ce99c pkgs.cgi --- a/pkgs.cgi Thu Dec 04 01:23:47 2014 +0200 +++ b/pkgs.cgi Thu Dec 04 01:41:59 2014 +0200 @@ -26,8 +26,8 @@ i18n_desc() { # Display localized short description - if [ -e "$LOCALSTATE/packages-desc.$LANG" ]; then - LOCDESC=$(grep -e "^$pkg " $LOCALSTATE/packages-desc.$LANG | cut -d' ' -f2) + if [ -e "$PKGS_DB/packages-desc.$LANG" ]; then + LOCDESC=$(grep -e "^$pkg " $PKGS_DB/packages-desc.$LANG | cut -d' ' -f2) [ "x$LOCDESC" != "x" ] && SHORT_DESC="$LOCDESC" fi } @@ -61,9 +61,9 @@ $(gettext 'Last recharge:') EOT - stat=$(stat -c %y $LOCALSTATE/packages.list | \ + stat=$(stat -c %y $PKGS_DB/packages.list | \ sed 's/\(:..\):.*/\1/' | awk '{print $1}') - mtime=$(find $LOCALSTATE/packages.list -mtime +10) + mtime=$(find $PKGS_DB/packages.list -mtime +10) echo -n "$stat " if [ "$mtime" ]; then gettext '(Older than 10 days)'; echo @@ -75,13 +75,13 @@ $(gettext 'Installed packages:') $(ls $INSTALLED | wc -l) $(gettext 'Mirrored packages:') - $(cat $LOCALSTATE/packages.list | wc -l) + $(cat $PKGS_DB/packages.list | wc -l) $(gettext 'Upgradeable packages:') - $(cat $LOCALSTATE/packages.up | wc -l) + $(cat $PKGS_DB/packages.up | wc -l) $(gettext 'Installed files:') $(cat $INSTALLED/*/files.list | wc -l) $(gettext 'Blocked packages:') - $(cat $LOCALSTATE/blocked-packages.list | wc -l) + $(cat $PKGS_DB/blocked-packages.list | wc -l) EOT @@ -107,7 +107,7 @@ # Parse repositories list to be able to have an icon and remove link list_repos() { - ls $LOCALSTATE/undigest 2> /dev/null | while read repo ; do + ls $PKGS_DB/undigest 2> /dev/null | while read repo ; do cat < $repo @@ -174,13 +174,13 @@ $(gettext 'extra') EOT - if [ -d $LOCALSTATE/undigest ]; then + if [ -d $PKGS_DB/undigest ]; then [ -n "$category" ] || category="base-system" cat << EOT

$(gettext 'Repositories')

$(gettext 'Public') EOT - for i in $(ls $LOCALSTATE/undigest); do + for i in $(ls $PKGS_DB/undigest); do cat << EOT $i EOT @@ -193,23 +193,23 @@ } repo_list() { - if [ -n "$(ls $LOCALSTATE/undigest/ 2> /dev/null)" ]; then + if [ -n "$(ls $PKGS_DB/undigest/ 2> /dev/null)" ]; then case "$repo" in Public) ;; - ""|Any) for i in $LOCALSTATE/undigest/* ; do + ""|Any) for i in $PKGS_DB/undigest/* ; do [ -d "$i" ] && echo "$i$1" done ;; - *) echo "$LOCALSTATE/undigest/$repo$1" + *) echo "$PKGS_DB/undigest/$repo$1" return ;; esac fi - echo "$LOCALSTATE$1" + echo "$PKGS_DB$1" } repo_name() { case "$1" in - $LOCALSTATE) echo "Public" ;; - $LOCALSTATE/undigest/*) echo ${1#$LOCALSTATE/undigest/} ;; + $PKGS_DB) echo "Public" ;; + $PKGS_DB/undigest/*) echo ${1#$PKGS_DB/undigest/} ;; esac } @@ -257,7 +257,7 @@ # Use default tazpkg icon since all packages displayed are # installed colorpkg=$pkg - grep -qs "^$pkg$" $LOCALSTATE/blocked-packages.list && + grep -qs "^$pkg$" $PKGS_DB/blocked-packages.list && colorpkg="$pkg" i18n_desc cat << EOT @@ -310,7 +310,7 @@ $(table_head) EOT - target=$(readlink $LOCALSTATE/fslink) + target=$(readlink $PKGS_DB/fslink) for pkg in $(ls $target/$INSTALLED) do [ -s $pkg/receipt ] && continue @@ -342,7 +342,7 @@ # List all available packages by category on mirror. Listing all # packages is too resource intensive and not useful. # - cd $LOCALSTATE + cd $PKGS_DB repo=$(GET repo) category=$(GET cat) [ "$category" == "cat" ] && category="base-system" @@ -405,7 +405,7 @@ # pkg=$(GET search) repo=$(GET repo) - cd $LOCALSTATE + cd $PKGS_DB search_form sidebar | sed "s/repo_$repo/active/" LOADING_MSG="$(gettext 'Searching packages...')" @@ -514,7 +514,7 @@ # # Upgrade packages # - cd $LOCALSTATE + cd $PKGS_DB search_form sidebar LOADING_MSG="$(gettext 'Checking for upgrades...')" @@ -546,8 +546,8 @@ EOT for pkg in `cat packages.up` do - grep -hs "^$pkg |" $LOCALSTATE/packages.desc \ - $LOCALSTATE/undigest/*/packages.desc | \ + grep -hs "^$pkg |" $PKGS_DB/packages.desc \ + $PKGS_DB/undigest/*/packages.desc | \ parse_packages_desc done cat << EOT @@ -576,7 +576,7 @@ LOADING_MSG="get-installing packages..." ;; link) - opt=$(readlink $LOCALSTATE/fslink) + opt=$(readlink $PKGS_DB/fslink) LOADING_MSG="linking packages..." ;; esac @@ -623,7 +623,7 @@ action="Remove" action_i18n=$(gettext 'Remove') else - cd $LOCALSTATE + cd $PKGS_DB LOADING_MSG=$(gettext 'Getting package info...') loading_msg IFS='|' @@ -654,7 +654,7 @@ fi if [ -d $INSTALLED/$pkg ]; then - if grep -qs "^$pkg$" $LOCALSTATE/blocked-packages.list; then + if grep -qs "^$pkg$" $PKGS_DB/blocked-packages.list; then cat << EOT $(gettext 'Unblock') EOT @@ -759,7 +759,7 @@ add-repo) # Decode url mirror=$(GET mirror) - repository=$LOCALSTATE/undigest/$(GET repository) + repository=$PKGS_DB/undigest/$(GET repository) case "$mirror" in http://*|ftp://*) mkdir -p $repository @@ -768,13 +768,13 @@ esac ;; rm-repo=*) repository=${cmd#rm-repo=} - rm -rf $LOCALSTATE/undigest/$repository ;; + rm -rf $PKGS_DB/undigest/$repository ;; esac [ "$cmd" == "$(gettext 'Set link')" ] && [ -d "$(GET link)/$INSTALLED" ] && - ln -fs $(GET link) $LOCALSTATE/fslink + ln -fs $(GET link) $PKGS_DB/fslink [ "$cmd" == "$(gettext 'Remove link')" ] && - rm -f $LOCALSTATE/fslink + rm -f $PKGS_DB/fslink cache_files=`find /var/cache/tazpkg -name *.tazpkg | wc -l` cache_size=`du -sh /var/cache/tazpkg` sidebar @@ -848,10 +848,10 @@

$(gettext 'Current mirror list')

EOT - for i in $LOCALSTATE/mirrors $LOCALSTATE/undigest/*/mirrors; do + for i in $PKGS_DB/mirrors $PKGS_DB/undigest/*/mirrors; do [ -s $i ] || continue echo '
' - if [ $i != $LOCALSTATE/mirrors ]; then + if [ $i != $PKGS_DB/mirrors ]; then Repo_Name="$(repo_name $(dirname $i))" echo "

$(eval_gettext 'Repository: $Repo_Name')

" fi @@ -871,7 +871,7 @@ EOT done echo "

$(gettext 'Private repositories')

" - [ -n "$(ls $LOCALSTATE/undigest 2> /dev/null)" ] && cat << EOT + [ -n "$(ls $PKGS_DB/undigest 2> /dev/null)" ] && cat << EOT