slitaz-forge rev 236
pkgs: full i18n provided, russian translate added, please recheck other langs
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Fri Apr 06 15:25:58 2012 +0300 (2012-04-06) |
| parents | 0d73b41d5f08 |
| children | d239045a74c4 |
| files | pkgs/lib/header.html pkgs/search.sh |
line diff
1.1 --- a/pkgs/lib/header.html Thu Apr 05 19:28:22 2012 +0200 1.2 +++ b/pkgs/lib/header.html Fri Apr 06 15:25:58 2012 +0300 1.3 @@ -1,15 +1,15 @@ 1.4 <!DOCTYPE html> 1.5 <html xmlns="http://www.w3.org/1999/xhtml"> 1.6 <head> 1.7 - <title>SliTaz Packages - Search %SEARCH%</title> 1.8 <meta charset="utf-8" /> 1.9 + <title>SliTaz Packages — Search %SEARCH%</title> 1.10 <meta name="description" content="slitaz packages search" /> 1.11 <meta name="keywords" lang="en" content="SliTaz, Tazpkg" /> 1.12 <meta name="robots" content="index, follow, all" /> 1.13 <meta name="expires" content="never" /> 1.14 <link rel="shortcut icon" href="style/favicon.ico" /> 1.15 - <link rel="stylesheet" type="text/css" href="style/slitaz.css" /> 1.16 - <link rel="stylesheet" type="text/css" href="pkgs.css" /> 1.17 + <link rel="stylesheet" type="text/css" href="style/slitaz.css" /> 1.18 + <link rel="stylesheet" type="text/css" href="pkgs.css" /> 1.19 </head> 1.20 <body> 1.21
2.1 --- a/pkgs/search.sh Thu Apr 05 19:28:22 2012 +0200 2.2 +++ b/pkgs/search.sh Fri Apr 06 15:25:58 2012 +0300 2.3 @@ -95,94 +95,198 @@ 2.4 if [ -z "$LANG" ]; then 2.5 for i in $(echo $HTTP_ACCEPT_LANGUAGE | sed 's/[,;]/ /g'); do 2.6 case "$i" in 2.7 - fr|de|pt|cn) 2.8 + fr|de|pt|ru|cn) 2.9 LANG=$i 2.10 break;; 2.11 esac 2.12 done 2.13 fi 2.14 2.15 -package="Package" 2.16 -file="File" 2.17 -desc="Description" 2.18 -tags="Tags" 2.19 -receipt="Receipt" 2.20 -file_list="File list" 2.21 -depends="Depends" 2.22 -bdepends="Build depends" 2.23 -loops="loops" 2.24 -search="Search" 2.25 -cooking="cooking" 2.26 -stable="stable" 2.27 -result="Result for : $SEARCH" 2.28 -noresult="No package $SEARCH" 2.29 -deptree="Dependency tree for : $SEARCH" 2.30 -rdeptree="Reverse dependency tree for : $SEARCH" 2.31 -bdeplist="$SEARCH needs these packages to be built" 2.32 -rbdeplist="Packages who need $SEARCH to be built" 2.33 -overloading="Theses packages may overload files of " 2.34 -overlap="common files" 2.35 -charset="ISO-8859-1" 2.36 +# --- Search form 2.37 +_package="Package" 2.38 +_desc="Description" 2.39 +_tags="Tags" 2.40 +_receipt="Receipt" 2.41 +_depends="Depends" 2.42 +_bdepends="Build depends" 2.43 +_file="File" 2.44 +_file_list="File list" 2.45 +_overlap="common files" 2.46 +_cooking="cooking" 2.47 +_search="Search" 2.48 +# --- Titles 2.49 +_noresult="No package $SEARCH" 2.50 +_search_title="Search" 2.51 +_depends_loops="Depends loops" 2.52 +_deptree="Dependency tree for: $SEARCH" 2.53 +_deptree_suggested="$_deptree (SUGGESTED)" 2.54 +_rdeptree="Reverse dependency tree for: $SEARCH" 2.55 +_bdepends_loops="Build depends loops" 2.56 +_bdeplist="$SEARCH needs these packages to be built" 2.57 +_rbdeplist="Packages who need $SEARCH to be built" 2.58 +_overloading="Theses packages may overload files of $SEARCH" 2.59 +_result="Result for: $SEARCH" 2.60 +_result_providing="$_result (package providing %VPKG%)" 2.61 +# --- Messages 2.62 +_main_libs_warn="glibc-base and gcc-lib-base are implicit dependencies, <b>every</b> package is supposed to depend on them." 2.63 +_description="description" 2.64 +_pkgs_report="%PKGS% packages and %FILES% files in $SLITAZ_VERSION database" 2.65 +# --- HTML Header 2.66 +_h_title="SliTaz Packages - Search %SEARCH%" 2.67 2.68 case "$LANG" in 2.69 2.70 -fr) package="Paquet" 2.71 - receipt="Recette" 2.72 - depends="Dpendances" 2.73 - bdepends="Fabrication" 2.74 - loops="sans fin" 2.75 - search="Recherche" 2.76 - result="Recherche de : $SEARCH" 2.77 - noresult="Paquet $SEARCH introuvable" 2.78 - deptree="Arbre des dpendances de $SEARCH" 2.79 - rdeptree="Arbre invers des dpendances de $SEARCH" 2.80 - bdeplist="$SEARCH a besion de ces paquets pour tre fabriqu" 2.81 - rbdeplist="Paquets ayant besion de $SEARCH pour tre fabriqus" 2.82 - overloading="Paquets pouvant craser des fichiers de " 2.83 - overlap="Fichiers communs" 2.84 - file_list="Liste des fichiers" 2.85 - file="Fichier";; 2.86 +fr) _package="Paquet" 2.87 +# _desc= 2.88 +# _tags= 2.89 + _receipt="Recette" 2.90 + _depends="Dépendances" 2.91 + _bdepends="Fabrication" 2.92 + _file="Fichier" 2.93 + _file_list="Liste des fichiers" 2.94 + _overlap="Fichiers communs" 2.95 +# _cooking= 2.96 + _search="Recherche" 2.97 2.98 -de) package="Paket" 2.99 - depends="Abhngigkeiten" 2.100 - desc="Beschreibung" 2.101 - search="Suche" 2.102 - cooking="Cooking" 2.103 - stable="Stable" 2.104 - result="Resultate fr : $SEARCH" 2.105 - noresult="Kein Paket fr $SEARCH" 2.106 - deptree="Abhngigkeiten von: $SEARCH" 2.107 - rdeptree="Abhngigkeit fr: $SEARCH" 2.108 - file_list="Datei liste" 2.109 - file="Datei";; 2.110 + _noresult="Paquet $SEARCH introuvable" 2.111 + _search_title="Search" 2.112 + _depends_loops="Dépendances sans fin" 2.113 + _deptree="Arbre des dépendances de $SEARCH" 2.114 + _deptree_suggested="$_deptree (SUGGESTED)" 2.115 + _rdeptree="Arbre inversé des dépendances de $SEARCH" 2.116 + _bdepends_loops="Fabrication sans fin" 2.117 + _bdeplist="$SEARCH a besion de ces paquets pour être fabriqué" 2.118 + _rbdeplist="Paquets ayant besion de $SEARCH pour être fabriqués" 2.119 + _overloading="Paquets pouvant écraser des fichiers de $SEARCH" 2.120 + _result="Recherche de : $SEARCH" 2.121 + _result_providing="$_result (package providing %VPKG%)" 2.122 2.123 -pt) package="Pacote" 2.124 - search="Buscar" 2.125 - cooking="cooking" 2.126 - stable="stable" 2.127 - result="Resultado para : $SEARCH" 2.128 - noresult="Sem resultado: $SEARCH" 2.129 - deptree="rvore de dependncias para: $SEARCH" 2.130 - rdeptree="rvore de dependncias reversa para: $SEARCH" 2.131 - depends="Dependncias" 2.132 - desc="Descrio" 2.133 - file_list="Arquivo lista" 2.134 - file="Arquivo";; 2.135 + _main_libs_warn=" glibc-base and gcc-lib-base are implicit dependencies, 2.136 + <b>every</b> package is supposed to depend on them." 2.137 + _description="description" 2.138 + _pkgs_report="%PKGS% packages and %FILES% files in $SLITAZ_VERSION database" 2.139 + ;; 2.140 2.141 -cn) package="软件包：" 2.142 - cooking="开发版" 2.143 - stable="稳定版" 2.144 - desc="描述" 2.145 - tags="标签" 2.146 - depends="依赖" 2.147 - file="文件" 2.148 - file_list="文件列表" 2.149 - search="Search" 2.150 - result="Result for : $SEARCH" 2.151 - noresult="No package $SEARCH" 2.152 - deptree="Dependency tree for : $SEARCH" 2.153 - rdeptree="Reverse dependency tree for : $SEARCH" 2.154 - charset="UTF-8";; 2.155 +de) _package="Paket" 2.156 + _desc="Beschreibung" 2.157 +# _tags= 2.158 +# _receipt= 2.159 + _depends="Abhängigkeiten" 2.160 +# _bdepends= 2.161 + _file="Datei" 2.162 + _file_list="Datei liste" 2.163 +# _overlap= 2.164 + _cooking="Cooking" 2.165 + _search="Suche" 2.166 + 2.167 + _noresult="Kein Paket für $SEARCH" 2.168 + _search_title="Search" 2.169 + _depends_loops="Abhängigkeiten loops" 2.170 + _deptree="Abhängigkeiten von: $SEARCH" 2.171 + _deptree_suggested="$_deptree (SUGGESTED)" 2.172 + _rdeptree="Abhängigkeit für: $SEARCH" 2.173 +# _bdepends_loops= 2.174 +# _bdeplist= 2.175 +# _rbdeplist= 2.176 +# _overloading= 2.177 + _result="Resultate für : $SEARCH" 2.178 + _result_providing="$_result (package providing %VPKG%)" 2.179 + 2.180 +# _main_libs_warn= 2.181 +# _description= 2.182 +# _pkgs_report= 2.183 + ;; 2.184 + 2.185 +pt) _package="Pacote" 2.186 + _desc="Descrição" 2.187 +# _tags= 2.188 +# _receipt= 2.189 + _depends="Dependências" 2.190 +# _bdepends= 2.191 + _file="Arquivo" 2.192 + _file_list="Arquivo lista" 2.193 +# _overlap= 2.194 +# _cooking= 2.195 + _search="Buscar" 2.196 + 2.197 + _noresult="Sem resultado: $SEARCH" 2.198 +# _search_title= 2.199 + _depends_loops="Dependências loops" 2.200 + _deptree="Árvore de dependências para: $SEARCH" 2.201 + _deptree_suggested="$_deptree (SUGGESTED)" 2.202 + _rdeptree="Árvore de dependências reversa para: $SEARCH" 2.203 +# _bdepends_loops= 2.204 +# _bdeplist= 2.205 +# _rbdeplist= 2.206 +# _overloading= 2.207 + _result="Resultado para : $SEARCH" 2.208 + _result_providing="$_result (package providing %VPKG%)" 2.209 + 2.210 +# _main_libs_warn= 2.211 +# _description= 2.212 +# _pkgs_report= 2.213 + ;; 2.214 + 2.215 +cn) _package="软件包：" 2.216 + _desc="描述" 2.217 + _tags="标签" 2.218 +# _receipt= 2.219 + _depends="依赖" 2.220 +# _bdepends= 2.221 + _file="文件" 2.222 + _file_list="文件列表" 2.223 +# _overlap= 2.224 + _cooking="开发版" 2.225 +# _search= 2.226 + 2.227 +# _noresult= 2.228 +# _search_title= 2.229 + _depends_loops="依赖 loops" 2.230 +# _deptree= 2.231 +# _deptree_suggested= 2.232 +# _rdeptree= 2.233 +# _bdepends_loops= 2.234 +# _bdeplist= 2.235 +# _rbdeplist= 2.236 +# _overloading= 2.237 +# _result= 2.238 +# _result_providing= 2.239 + 2.240 +# _main_libs_warn= 2.241 +# _description= 2.242 +# _pkgs_report= 2.243 +# _stable="稳定版" 2.244 + ;; 2.245 + 2.246 +ru) _package="пакет" 2.247 + _desc="описание" 2.248 + _tags="теги" 2.249 + _receipt="рецепт" 2.250 + _depends="зависимости" 2.251 + _bdepends="зависимости сборки" 2.252 + _file="файл" 2.253 + _file_list="список файлов" 2.254 + _overlap="общие файлы" 2.255 +# _cooking= 2.256 + _search="Искать" 2.257 + 2.258 + _noresult="Пакет $SEARCH отсутствует" 2.259 + _search_title="Поиск" 2.260 + _depends_loops="Циклические зависимости" 2.261 + _deptree="Дерево зависимостей для $SEARCH" 2.262 + _deptree_suggested="Дерево необязательных зависимостей для $SEARCH" 2.263 + _rdeptree="Обратное дерево зависимостей для $SEARCH" 2.264 + _bdepends_loops="Циклические зависимости сборки" 2.265 + _bdeplist="Следующие пакеты нужны, чтобы собрать $SEARCH" 2.266 + _rbdeplist="$SEARCH нужен, чтобы собрать следующие пакеты" 2.267 + _overloading="Следующие пакеты могут заменить файлы $SEARCH" 2.268 + _result="Результаты поиска $SEARCH" 2.269 + _result_providing="$_result (пакеты, предлагающие %VPKG%)" 2.270 + 2.271 + _main_libs_warn="glibc-base и gcc-lib-base являются неявными зависимостями <b>любого</b> пакета." 2.272 + _description="описание" 2.273 + _pkgs_report="%PKGS% пакетов и %FILES% файлов в базе данных $SLITAZ_VERSION" 2.274 + ;; 2.275 2.276 *) LANG="en";; 2.277 2.278 @@ -203,26 +307,26 @@ 2.279 <form method="post" action="$(basename $SCRIPT_NAME)"> 2.280 <input type="hidden" name="lang" value="$LANG" /> 2.281 <select name="object"> 2.282 - <option value="Package">$package</option> 2.283 - <option $selected_desc value="Desc">$desc</option> 2.284 - <option $selected_tags value="Tags">$tags</option> 2.285 - <option $selected_receipt value="Receipt">$receipt</option> 2.286 - <option $selected_depends value="Depends">$depends</option> 2.287 - <option $selected_build_depends value="BuildDepends">$bdepends</option> 2.288 - <option $selected_file value="File">$file</option> 2.289 - <option $selected_file_list value="File_list">$file_list</option> 2.290 - <option $selected_overlap value="FileOverlap">$overlap</option> 2.291 + <option value="Package">$_package</option> 2.292 + <option $selected_desc value="Desc">$_desc</option> 2.293 + <option $selected_tags value="Tags">$_tags</option> 2.294 + <option $selected_receipt value="Receipt">$_receipt</option> 2.295 + <option $selected_depends value="Depends">$_depends</option> 2.296 + <option $selected_build_depends value="BuildDepends">$_bdepends</option> 2.297 + <option $selected_file value="File">$_file</option> 2.298 + <option $selected_file_list value="File_list">$_file_list</option> 2.299 + <option $selected_overlap value="FileOverlap">$_overlap</option> 2.300 </select> 2.301 <input type="text" name="query" size="20" value="$SEARCH" /> 2.302 <select name="version"> 2.303 - <option value="cooking">$cooking</option> 2.304 + <option value="cooking">$_cooking</option> 2.305 <option $selected_stable value="stable">3.0</option> 2.306 <option $selected_2 value="2.0">2.0</option> 2.307 <option $selected_1 value="1.0">1.0</option> 2.308 <option $selected_tiny value="tiny">tiny</option> 2.309 <option $selected_undigest value="undigest">undigest</option> 2.310 </select> 2.311 - <input type="submit" name="search" value="$search" /> 2.312 + <input type="submit" name="search" value="$_search" /> 2.313 </form> 2.314 </div> 2.315 _EOT_ 2.316 @@ -230,15 +334,26 @@ 2.317 2.318 # xHTML Header. 2.319 xhtml_header() { 2.320 - cat lib/header.html | sed s/'%SEARCH%'/"$SEARCH"/ 2.321 + header=$(cat lib/header.html | sed s/'%SEARCH%'/"$SEARCH"/) 2.322 + # header i18n 2.323 + case "$LANG" in 2.324 + pt) 2.325 + header=$(echo "$header" | sed 's/SliTaz Packages/SliTaz Pacotes/g;s/Community/Comunidade/;s/Forum/Fórum');; 2.326 + ru) 2.327 + header=$(echo "$header" | sed 's/SliTaz Packages/Пакеты SliTaz/g;s/Home/Сайт/;s/Community/Сообщество/;s/Doc/Документация/;s/Forum/Форум/;s/Pro/PRO/;s/Shop/Магазин/;s/Bugs/Баг-трекер/');; 2.328 + esac 2.329 + echo "$header" 2.330 } 2.331 2.332 # xHTML Footer. 2.333 xhtml_footer() { 2.334 +# Is it not too hard? (unlzma etc...) -- lexeii 2.335 +PKGS=$(ls $WOK/ | wc -l) 2.336 +FILES=$(unlzma -c $PACKAGES_REPOSITORY/files.list.lzma | wc -l) 2.337 cat << _EOT_ 2.338 2.339 <center> 2.340 -<i>$(ls $WOK/ | wc -l) packages and $(unlzma -c $PACKAGES_REPOSITORY/files.list.lzma | wc -l) files in $SLITAZ_VERSION database</i> 2.341 +<i>$(echo $_pkgs_report | sed s/'%PKGS%'/"$PKGS"/ | sed s/'%FILES%'/"$FILES"/)</i> 2.342 </center> 2.343 2.344 _EOT_ 2.345 @@ -263,7 +378,7 @@ 2.346 PACKAGE_URL="http://mirror.slitaz.org/packages/$SLITAZ_VERSION/$PACKAGE-$VERSION$EXTRA_VERSION.tazpkg" 2.347 nslookup mirror.slitaz.org | grep -q 127.0.0.1 && 2.348 PACKAGE_URL="http://mirror.slitaz.org/packages/$SLITAZ_VERSION/$(cd /var/www/slitaz/mirror/packages/$SLITAZ_VERSION ; ls $PACKAGE-$VERSION*.tazpkg)" 2.349 - busybox wget -s $PACKAGE_URL 2> /dev/null && 2.350 + busybox wget -s $PACKAGE_URL 2> /dev/null && 2.351 PACKAGE_HREF="<a href=\"$PACKAGE_URL\">$PACKAGE</a>" 2.352 cat << _EOT_ 2.353 $PACKAGE_HREF $(installed_size $PACKAGE): $SHORT_DESC 2.354 @@ -332,7 +447,7 @@ 2.355 WANTED="" 2.356 . $WOK/$i/receipt 2.357 if [ -n "$3" ]; then 2.358 - [ -n "$BUILD_DEPENDS$WANTED" ] && 2.359 + [ -n "$BUILD_DEPENDS$WANTED" ] && 2.360 dep_scan "$WANTED $BUILD_DEPENDS" "$2 " $3 2.361 else 2.362 [ -n "$DEPENDS" ] && dep_scan "$DEPENDS" "$2 " 2.363 @@ -345,10 +460,7 @@ 2.364 { 2.365 SEARCH=$1 2.366 case "$SEARCH" in 2.367 -glibc-base|gcc-lib-base) cat <<EOT 2.368 - glibc-base and gcc-lib-base are implicit dependencies, 2.369 - <b>every</b> package is supposed to depend on them. 2.370 -EOT 2.371 +glibc-base|gcc-lib-base) echo $_main_libs_warn 2.372 return;; 2.373 esac 2.374 for i in $WOK/* ; do 2.375 @@ -384,7 +496,7 @@ 2.376 ' | while read pkg; do 2.377 . $WOK/${pkg##*/}/receipt 2.378 cat << _EOT_ 2.379 -$(echo ${pkg%/*} | sed 's|/| |g') $(package_entry) 2.380 +$(echo ${pkg%/*} | sed 's|/| |g') $(package_entry) 2.381 _EOT_ 2.382 done 2.383 } 2.384 @@ -395,7 +507,7 @@ 2.385 [ -f $WOK/$1/receipt ] && return 0 2.386 cat << _EOT_ 2.387 2.388 -<h3>$noresult</h3> 2.389 +<h3>$_noresult</h3> 2.390 <pre> 2.391 _EOT_ 2.392 return 1 2.393 @@ -421,7 +533,7 @@ 2.394 pkg=${pkg%:} 2.395 if [ "$pkg" != "$last" ]; then 2.396 . $WOK/$pkg/receipt 2.397 - 2.398 + 2.399 package_entry 2.400 last=$pkg 2.401 fi 2.402 @@ -438,7 +550,7 @@ 2.403 <div id="content"> 2.404 <a name="content"></a> 2.405 2.406 -<h2>$search</h2> 2.407 +<h2>$_search_title</h2> 2.408 _EOT_ 2.409 search_form 2.410 xhtml_footer 2.411 @@ -450,14 +562,14 @@ 2.412 <div id="content"> 2.413 <a name="content"></a> 2.414 2.415 -<h2>$search</h2> 2.416 +<h2>$_search_title</h2> 2.417 _EOT_ 2.418 search_form 2.419 if [ "$OBJECT" = "Depends" ]; then 2.420 if [ -z "$SEARCH" ]; then 2.421 cat << _EOT_ 2.422 2.423 -<h3>$depends $loops</h3> 2.424 +<h3>$_depends_loops</h3> 2.425 <pre> 2.426 _EOT_ 2.427 for i in $WOK/*/receipt; do 2.428 @@ -472,7 +584,7 @@ 2.429 elif package_exist $SEARCH ; then 2.430 cat << _EOT_ 2.431 2.432 -<h3>$deptree</h3> 2.433 +<h3>$_deptree</h3> 2.434 <pre> 2.435 _EOT_ 2.436 ALL_DEPS="" 2.437 @@ -483,7 +595,7 @@ 2.438 cat << _EOT_ 2.439 </pre> 2.440 2.441 -<h3>$deptree (SUGGESTED)</h3> 2.442 +<h3>$_deptree_suggested</h3> 2.443 <pre> 2.444 _EOT_ 2.445 ALL_DEPS="" 2.446 @@ -492,7 +604,7 @@ 2.447 cat << _EOT_ 2.448 </pre> 2.449 2.450 -<h3>$rdeptree</h3> 2.451 +<h3>$_rdeptree</h3> 2.452 <pre> 2.453 _EOT_ 2.454 ALL_DEPS="" 2.455 @@ -505,7 +617,7 @@ 2.456 if [ -z "$SEARCH" ]; then 2.457 cat << _EOT_ 2.458 2.459 -<h3>$bdepends $loops</h3> 2.460 +<h3>$_bdepends_loops</h3> 2.461 <pre> 2.462 _EOT_ 2.463 for i in $WOK/*/receipt; do 2.464 @@ -521,7 +633,7 @@ 2.465 elif package_exist $SEARCH ; then 2.466 cat << _EOT_ 2.467 2.468 -<h3>$bdeplist</h3> 2.469 +<h3>$_bdeplist</h3> 2.470 <pre> 2.471 _EOT_ 2.472 ALL_DEPS="" 2.473 @@ -529,7 +641,7 @@ 2.474 cat << _EOT_ 2.475 </pre> 2.476 2.477 -<h3>$rbdeplist</h3> 2.478 +<h3>$_rbdeplist</h3> 2.479 <pre> 2.480 _EOT_ 2.481 ALL_DEPS="" 2.482 @@ -542,7 +654,7 @@ 2.483 if package_exist $SEARCH ; then 2.484 cat << _EOT_ 2.485 2.486 -<h3>$overloading $SEARCH</h3> 2.487 +<h3>$_overloading</h3> 2.488 <pre> 2.489 _EOT_ 2.490 ( unlzma -c $PACKAGES_REPOSITORY/files.list.lzma | grep ^$SEARCH: ; 2.491 @@ -565,7 +677,7 @@ 2.492 elif [ "$OBJECT" = "File" ]; then 2.493 cat << _EOT_ 2.494 2.495 -<h3>$result</h3> 2.496 +<h3>$_result</h3> 2.497 <pre> 2.498 _EOT_ 2.499 last="" 2.500 @@ -588,7 +700,7 @@ 2.501 if package_exist $SEARCH; then 2.502 cat << _EOT_ 2.503 2.504 -<h3>$result</h3> 2.505 +<h3>$_result</h3> 2.506 <pre> 2.507 _EOT_ 2.508 last="" 2.509 @@ -605,8 +717,7 @@ 2.510 if [ -f $WOK/$SEARCH/description.txt ]; then 2.511 cat << _EOT_ 2.512 2.513 -<h3>$result</h3> 2.514 -<pre> 2.515 +<h3>$_result</h3> 2.516 <pre> 2.517 $(htmlize < $WOK/$SEARCH/description.txt) 2.518 </pre> 2.519 @@ -614,7 +725,7 @@ 2.520 else 2.521 cat << _EOT_ 2.522 2.523 -<h3>$result</h3> 2.524 +<h3>$_result</h3> 2.525 <pre> 2.526 _EOT_ 2.527 last="" 2.528 @@ -627,7 +738,7 @@ 2.529 elif [ "$OBJECT" = "Tags" ]; then 2.530 cat << _EOT_ 2.531 2.532 -<h3>$result</h3> 2.533 +<h3>$_result</h3> 2.534 <pre> 2.535 _EOT_ 2.536 last="" 2.537 @@ -639,8 +750,7 @@ 2.538 elif [ "$OBJECT" = "Receipt" ]; then 2.539 package_exist $SEARCH && cat << _EOT_ 2.540 2.541 -<h3>$result</h3> 2.542 -<pre> 2.543 +<h3>$_result</h3> 2.544 <pre> 2.545 $(if [ -f $WOK/$SEARCH/taz/*/receipt ]; then 2.546 cat $WOK/$SEARCH/taz/*/receipt 2.547 @@ -652,13 +762,13 @@ 2.548 else 2.549 cat << _EOT_ 2.550 2.551 -<h3>$result</h3> 2.552 +<h3>$_result</h3> 2.553 <pre> 2.554 _EOT_ 2.555 for pkg in `ls $WOK/ | grep "$SEARCH"` 2.556 do 2.557 . $WOK/$pkg/receipt 2.558 - DESC=" <a href=\"?desc=$pkg\">description</a>" 2.559 + DESC=" <a href=\"?desc=$pkg\">$_description</a>" 2.560 [ -f $WOK/$pkg/description.txt ] || DESC="" 2.561 cat << _EOT_ 2.562 $(package_entry)$DESC 2.563 @@ -670,7 +780,7 @@ 2.564 cat << _EOT_ 2.565 </pre> 2.566 2.567 -<h3>$result (package providing $vpkg)</h3> 2.568 +<h3>$(echo $_result_providing | sed s/'%VPKG%'/"$vpkg"/)</h3> 2.569 <pre> 2.570 _EOT_ 2.571 for pkg in $(grep $vpkg= $equiv | sed "s/$vpkg=//"); do