tazpkg rev 309
Small code clean-up
| author | Christophe Lincoln <pankso@slitaz.org> |
|---|---|
| date | Wed Jan 06 22:27:51 2010 +0100 (2010-01-06) |
| parents | fa97de9857e0 |
| children | 1bd156f6fa52 |
| files | tazpkg |
line diff
1.1 --- a/tazpkg Wed Jan 06 22:21:23 2010 +0100 1.2 +++ b/tazpkg Wed Jan 06 22:27:51 2010 +0100 1.3 @@ -1353,8 +1353,7 @@ 1.4 echo "================================================================================" 1.5 echo "$packages packages installed." 1.6 echo "" 1.7 - fi 1.8 - ;; 1.9 + fi ;; 1.10 xhtml-list) 1.11 # Get info in receipts and build list. 1.12 DATE=`date +%Y-%m-%d\ \%H:%M:%S` 1.13 @@ -1387,8 +1386,7 @@ 1.14 sed -i s/'_packages_'/"$packages"/ $XHTML_LIST 1.15 echo "================================================================================" 1.16 echo "$XHTML_LIST created - $packages packages." 1.17 - echo "" 1.18 - ;; 1.19 + echo "" ;; 1.20 list-mirror) 1.21 # List all available packages on the mirror. Option --diff displays 1.22 # last mirrored packages diff (see recharge). 1.23 @@ -1422,8 +1420,7 @@ 1.24 echo "================================================================================" 1.25 pkgs=`cat $LOCALSTATE/packages.list | wc -l` 1.26 echo "$pkgs packages in the last recharged list." 1.27 - echo "" 1.28 - ;; 1.29 + echo "" ;; 1.30 list-files) 1.31 # List files installed with the package. 1.32 # 1.33 @@ -1436,8 +1433,7 @@ 1.34 echo "================================================================================" 1.35 files=`cat $INSTALLED/$PACKAGE/files.list | wc -l` 1.36 echo "$files files installed with $PACKAGE." 1.37 - echo "" 1.38 - ;; 1.39 + echo "" ;; 1.40 info) 1.41 # Information about package. 1.42 # 1.43 @@ -1469,8 +1465,7 @@ 1.44 echo -e "Web site : $WEB_SITE" 1.45 fi 1.46 echo "================================================================================" 1.47 - echo "" 1.48 - ;; 1.49 + echo "" ;; 1.50 desc) 1.51 # Display package description.txt if available. 1.52 if [ -f "$INSTALLED/$PACKAGE/description.txt" ]; then 1.53 @@ -1482,8 +1477,7 @@ 1.54 echo "" 1.55 else 1.56 echo -e "\nSorry, no description available for this package.\n" 1.57 - fi 1.58 - ;; 1.59 + fi ;; 1.60 search) 1.61 # Search for a package by pattern or name. 1.62 # 1.63 @@ -1507,8 +1501,7 @@ 1.64 *) 1.65 search_in_installed_packages 1.66 search_in_packages_list ;; 1.67 - esac 1.68 - ;; 1.69 + esac ;; 1.70 search-file) 1.71 # Search for a file by pattern or name in all files.list. 1.72 # 1.73 @@ -1567,8 +1560,7 @@ 1.74 echo "================================================================================" 1.75 echo "$match file(s) found for : $2" 1.76 echo "" 1.77 - fi 1.78 - ;; 1.79 + fi ;; 1.80 install) 1.81 # Install .tazpkg packages. 1.82 # 1.83 @@ -1599,8 +1591,7 @@ 1.84 if [ "$DO_CHECK" = "yes" ]; then 1.85 check_for_installed_package $ROOT 1.86 fi 1.87 - install_package $ROOT 1.88 - ;; 1.89 + install_package $ROOT ;; 1.90 install-list|get-install-list) 1.91 # Install a set of packages from a list. 1.92 # 1.93 @@ -1634,18 +1625,15 @@ 1.94 grep -qs ^$pkg$ $2-processed && continue 1.95 tazpkg $COMMAND $pkg --list=$2 "$3" "$4" "$5" 1.96 done 1.97 - rm -f $2-processed 1.98 - ;; 1.99 + rm -f $2-processed ;; 1.100 add-flavor) 1.101 # Install a set of packages from a flavor. 1.102 # 1.103 - install_flavor $2 1.104 - ;; 1.105 + install_flavor $2 ;; 1.106 install-flavor) 1.107 # Install a set of packages from a flavor and purge other ones. 1.108 # 1.109 - install_flavor $2 --purge 1.110 - ;; 1.111 + install_flavor $2 --purge ;; 1.112 set-release) 1.113 # Change curent release and upgrade packages. 1.114 # 1.115 @@ -1667,8 +1655,7 @@ 1.116 for j in $DEPENDS ; do 1.117 [ -d $j ] || tazpkg get-install $j 1.118 done 1.119 - done 1.120 - ;; 1.121 + done ;; 1.122 remove) 1.123 # Remove packages. 1.124 # 1.125 @@ -1772,8 +1759,7 @@ 1.126 echo "" 1.127 echo "Uninstallation of $PACKAGE cancelled." 1.128 fi 1.129 - echo "" 1.130 - ;; 1.131 + echo "" ;; 1.132 extract) 1.133 # Extract .tazpkg cpio archive into a directory. 1.134 # 1.135 @@ -1797,8 +1783,7 @@ 1.136 extract_package 1.137 echo "================================================================================" 1.138 echo "$PACKAGE is extracted to : $DESTDIR" 1.139 - echo "" 1.140 - ;; 1.141 + echo "" ;; 1.142 recompress) 1.143 # Recompress .tazpkg cpio archive with lzma. 1.144 # 1.145 @@ -1824,8 +1809,7 @@ 1.146 $TOP_DIR/$(basename $PACKAGE_FILE) 1.147 status 1.148 cd $TOP_DIR 1.149 - rm -rf $TMP_DIR 1.150 - ;; 1.151 + rm -rf $TMP_DIR ;; 1.152 list-config) 1.153 # List configuration files installed. 1.154 # 1.155 @@ -1860,8 +1844,7 @@ 1.156 done | sed 's|^|/|' | sort 1.157 echo "================================================================================" 1.158 echo "" 1.159 - fi 1.160 - ;; 1.161 + fi ;; 1.162 repack-config) 1.163 # Create SliTaz package archive from configuration files. 1.164 # 1.165 @@ -1965,8 +1948,7 @@ 1.166 \rm -R $TMP_DIR 1.167 echo "Package $PACKAGE repacked successfully." 1.168 echo "Size : `du -sh $PACKAGE-$VERSION$EXTRAVERSION.tazpkg`" 1.169 - echo "" 1.170 - ;; 1.171 + echo "" ;; 1.172 pack) 1.173 # Create SliTaz package archive using cpio and gzip. 1.174 # 1.175 @@ -2022,8 +2004,7 @@ 1.176 echo "Package $PACKAGE compressed successfully." 1.177 echo "Size : `du -sh $PACKAGE.tazpkg`" 1.178 echo "" 1.179 - fi 1.180 - ;; 1.181 + fi ;; 1.182 recharge) 1.183 # Recharge packages.list from a mirror. 1.184 # 1.185 @@ -2080,8 +2061,7 @@ 1.186 Last packages.list is ready to use. Note that next time you recharge the list, 1.187 a list of differences will be displayed to show new and upgradeable packages.\n" 1.188 fi 1.189 - done 1.190 - ;; 1.191 + done ;; 1.192 upgrade) 1.193 # Upgrade all installed packages with the new version from the mirror. 1.194 # 1.195 @@ -2242,8 +2222,7 @@ 1.196 EOT 1.197 fi 1.198 done 1.199 - echo "$MSG" 1.200 - ;; 1.201 + echo "$MSG" ;; 1.202 check) 1.203 # Check installed packages set. 1.204 # 1.205 @@ -2328,8 +2307,7 @@ 1.206 MSG="" 1.207 done 1.208 fi 1.209 - echo "Check completed." 1.210 - ;; 1.211 + echo "Check completed." ;; 1.212 block) 1.213 # Add a pkg name to the list of blocked packages. 1.214 # 1.215 @@ -2348,8 +2326,7 @@ 1.216 . $INSTALLED/$PACKAGE/receipt 1.217 log Blocked 1.218 fi 1.219 - echo "" 1.220 - ;; 1.221 + echo "" ;; 1.222 unblock) 1.223 # Remove a pkg name from the list of blocked packages. 1.224 # 1.225 @@ -2369,8 +2346,7 @@ 1.226 echo "" 1.227 exit 0 1.228 fi 1.229 - echo "" 1.230 - ;; 1.231 + echo "" ;; 1.232 get) 1.233 # Downlowd a package with wget. 1.234 # 1.235 @@ -2379,8 +2355,7 @@ 1.236 check_for_package_in_list 1.237 echo "" 1.238 download $PACKAGE.tazpkg 1.239 - echo "" 1.240 - ;; 1.241 + echo "" ;; 1.242 get-install) 1.243 # Download and install a package. 1.244 # 1.245 @@ -2436,8 +2411,7 @@ 1.246 fi 1.247 PACKAGE_FILE=$CACHE_DIR/$PACKAGE.tazpkg 1.248 install_package $ROOT 1.249 - [ "$AUTOEXEC" != "no" ] && $PACKAGE $ROOT 1.250 - ;; 1.251 + [ "$AUTOEXEC" != "no" ] && $PACKAGE $ROOT ;; 1.252 clean-cache) 1.253 # Remove all downloaded packages. 1.254 # 1.255 @@ -2451,8 +2425,7 @@ 1.256 status 1.257 echo "================================================================================" 1.258 echo "$files file(s) removed from cache." 1.259 - echo "" 1.260 - ;; 1.261 + echo "" ;; 1.262 list-undigest) 1.263 # list undigest URLs. 1.264 # 1.265 @@ -2473,8 +2446,7 @@ 1.266 echo "$(basename $(dirname $i)) $(cat $i)" 1.267 done 1.268 echo "" 1.269 - fi 1.270 - ;; 1.271 + fi ;; 1.272 remove-undigest) 1.273 # remove undigest URL. 1.274 # 1.275 @@ -2489,8 +2461,7 @@ 1.276 fi 1.277 else 1.278 echo "Undigest $2 not found" 1.279 - fi 1.280 - ;; 1.281 + fi ;; 1.282 add-undigest|setup-undigest) 1.283 # Add undigest URL. 1.284 # 1.285 @@ -2508,14 +2479,12 @@ 1.286 echo "Creating new undigest $undigest." 1.287 mkdir $LOCALSTATE/undigest/$undigest 1.288 fi 1.289 - setup_mirror $LOCALSTATE/undigest/$undigest $3 1.290 - ;; 1.291 + setup_mirror $LOCALSTATE/undigest/$undigest $3 ;; 1.292 setup-mirror) 1.293 # Change mirror URL. 1.294 # 1.295 check_root 1.296 - setup_mirror $LOCALSTATE $2 1.297 - ;; 1.298 + setup_mirror $LOCALSTATE $2 ;; 1.299 reconfigure) 1.300 # Replay post_install from receipt 1.301 # 1.302 @@ -2525,12 +2494,10 @@ 1.303 while [ -n "$3" ]; do 1.304 case "$3" in 1.305 --root=*) 1.306 - ROOT="${3#--root=}/" 1.307 - ;; 1.308 + ROOT="${3#--root=}/" ;; 1.309 *) shift 2 1.310 echo -e "\nUnknown option $*.\n" 1.311 - exit 1 1.312 - ;; 1.313 + exit 1 ;; 1.314 esac 1.315 shift 1.316 done 1.317 @@ -2548,8 +2515,7 @@ 1.318 else 1.319 echo -e "\npackage $PACKAGE is not installed." 1.320 echo -e "Install package with 'tazpkg install' or 'tazpkg get-install'\n" 1.321 - fi 1.322 - ;; 1.323 + fi ;; 1.324 shell) 1.325 # Tazpkg SHell 1.326 # 1.327 @@ -2581,24 +2547,21 @@ 1.328 *) 1.329 tazpkg $cmd ;; 1.330 esac 1.331 - done 1.332 - ;; 1.333 + done ;; 1.334 depends) 1.335 # Display dependencies tree 1.336 cd $INSTALLED 1.337 ALL_DEPS="" 1.338 if [ -f $2/receipt ]; then 1.339 dep_scan $2 "" 1.340 - fi 1.341 - ;; 1.342 + fi ;; 1.343 rdepends) 1.344 # Display reverse dependencies tree 1.345 cd $INSTALLED 1.346 ALL_DEPS="" 1.347 if [ -f $2/receipt ]; then 1.348 rdep_scan $2 1.349 - fi 1.350 - ;; 1.351 + fi ;; 1.352 convert) 1.353 # convert misc package format to .tazpkg 1.354 check_for_package_file 1.355 @@ -2615,8 +2578,7 @@ 1.356 convert_ipk;; 1.357 *) 1.358 echo "Unsupported format";; 1.359 - esac 1.360 - ;; 1.361 + esac ;; 1.362 link) 1.363 # link a package from another slitaz installation 1.364 PACKAGE=$2 1.365 @@ -2669,8 +2631,7 @@ 1.366 done < $INSTALLED/$PACKAGE/files.list 1.367 if grep -q ^post_install $INSTALLED/$PACKAGE/receipt; then 1.368 post_install 1.369 - fi 1.370 - ;; 1.371 + fi ;; 1.372 usage|*) 1.373 # Print a short help or give usage for an unknown or empty command. 1.374 usage ;;