spk rev 30
spk-add: some colors, improvments, usage
author | Christophe Lincoln <pankso@slitaz.org> |
---|---|
date | Tue May 15 19:35:44 2012 +0200 (2012-05-15) |
parents | 1e166d1364d7 |
children | ea3c01346d05 |
files | lib/libspk.sh spk-add spk-ls spk-rm |
line diff
1.1 --- a/lib/libspk.sh Tue May 15 19:02:53 2012 +0200 1.2 +++ b/lib/libspk.sh Tue May 15 19:35:44 2012 +0200 1.3 @@ -100,7 +100,7 @@ 1.4 check_installed() { 1.5 local name="$1" 1.6 if [ -d "$installed/$name" ]; then 1.7 - echo $(boldify "$name") $(gettext "package is already installed.") 1.8 + echo $(boldify "$name") $(gettext "package is already installed") 1.9 continue 1.10 fi 1.11 } 1.12 @@ -145,7 +145,7 @@ 1.13 for pkgorg in $depends; do 1.14 local pkg=$(equivalent_pkg $pkgorg) 1.15 if [ ! -d "$installed/$pkg" ]; then 1.16 - gettext "Missing: \$pkg"; newline 1.17 + gettext "Missing:"; echo " $pkg" 1.18 deps=$(($deps+1)) 1.19 elif [ ! -f "$installed/$pkg/receipt" ]; then 1.20 gettext "WARNING Dependency loop between \$package and \$pkg."; newline 1.21 @@ -155,7 +155,8 @@ 1.22 echo $deps $(gettext "missing package(s) to install.") 1.23 fi 1.24 1.25 - gettext "\$deps missing package(s) to install."; newline 1.26 + echo -n "$(colorize "$deps" 34) " 1.27 + gettext "missing dep(s) to install."; newline 1.28 1.29 # Return true if missing deps 1.30 [ "$deps" != "0" ]
2.1 --- a/spk-add Tue May 15 19:02:53 2012 +0200 2.2 +++ b/spk-add Tue May 15 19:35:44 2012 +0200 2.3 @@ -27,6 +27,8 @@ 2.4 $(gettext "Install SliTaz Packages") 2.5 2.6 $(boldify $(gettext "Options:")) 2.7 + --forced $(gettext "Force package reinstallation") 2.8 + --root= $(gettext "Set the root file system path") 2.9 2.10 $(boldify $(gettext "Examples:")) 2.11 $name package1 package2 packageN 2.12 @@ -259,8 +261,6 @@ 2.13 install_web() { 2.14 local package_name="$1" 2.15 2.16 - check_root 2.17 - 2.18 # Check if get-Package 2.19 if ! is_package_mirrored $package_name; then 2.20 package_name="get-$package_name" 2.21 @@ -283,18 +283,17 @@ 2.22 2.23 cd $CACHE_DIR > /dev/null 2.24 if [ -f "$package_full.tazpkg" ]; then 2.25 - eval_gettext "\$package_full is already in the cache : \$CACHE_DIR"; newline 2.26 + echo -n "$(colorize "$package_full" 34) "; echo ": $CACHE_DIR)" 2.27 # Check package download was finished 2.28 if ! tail -c 2k $package_full.tazpkg | fgrep -q 00000000TRAILER; then 2.29 eval_gettext "Continuing \$package_name download"; newline 2.30 download "$package_full.tazpkg" 2.31 fi 2.32 - 2.33 # Check that the package has the correct checksum 2.34 -# if [ "$($CHECKSUM $package_full.tazpkg)" != "$(fgrep \" $package_full.tazpkg\" $pkgsmd5)" ]; then 2.35 -# rm -f $package.tazpkg 2.36 -# download "$package_full.tazpkg" 2.37 -# fi 2.38 + #if [ "$($CHECKSUM $package_full.tazpkg)" != "$(fgrep \" $package_full.tazpkg\" $pkgsmd5)" ]; then 2.39 + # rm -f $package.tazpkg 2.40 + # download "$package_full.tazpkg" 2.41 + #fi 2.42 else 2.43 newline 2.44 download "$package_full.tazpkg" 2.45 @@ -338,15 +337,12 @@ 2.46 fi 2.47 } 2.48 2.49 -# Old style 2.50 -case $1 in 2.51 - install|-i) 2.52 - install_local $2 $3 2.53 - exit 0 ;; 2.54 - get-install|-gi) 2.55 - install_web $2 2.56 - exit 0 ;; 2.57 - "") usage ;; 2.58 +# 2.59 +# Commands and exit 2.60 +# 2.61 + 2.62 +case "$1" in 2.63 + ""|*usage|*help) usage ;; 2.64 esac 2.65 2.66 # 2.67 @@ -358,9 +354,15 @@ 2.68 for pkg in $@ 2.69 do 2.70 case "$pkg" in 2.71 - *.tazpkg|.spk) 2.72 - echo "Local package" ;; 2.73 + *.tazpkg|*.spk) 2.74 + [ "$forced" ] || check_installed $(package_name $package_file) 2.75 + echo "Local package" 2.76 + #install_local $pkg 2.77 + ;; 2.78 + --*) continue ;; 2.79 + *) 2.80 + [ "$forced" ] || check_installed $pkg 2.81 + install_web $pkg ;; 2.82 esac 2.83 - echo "Adding: $pkg" 2.84 done 2.85 exit 0
3.1 --- a/spk-ls Tue May 15 19:02:53 2012 +0200 3.2 +++ b/spk-ls Tue May 15 19:35:44 2012 +0200 3.3 @@ -26,7 +26,7 @@ 3.4 --mirror $(gettext "List all the packages on mirror") 3.5 --blocked $(gettext "List all blocked packages") 3.6 --short $(gettext "Short list of installed packages") 3.7 - --root $(gettext "Set the root file system path") 3.8 + --root= $(gettext "Set the root file system path") 3.9 --color=NB $(gettext "Set package name color in list") 3.10 --debug $(gettext "Display some usefull debug information") 3.11
4.1 --- a/spk-rm Tue May 15 19:02:53 2012 +0200 4.2 +++ b/spk-rm Tue May 15 19:35:44 2012 +0200 4.3 @@ -23,7 +23,7 @@ 4.4 4.5 $(boldify $(gettext "Options:")) 4.6 --confirm $(gettext "Ask before removing any packages") 4.7 - --root $(gettext "Set the root file system path") 4.8 + --root= $(gettext "Set the root file system path") 4.9 --verbose $(gettext "Be more verbose when removing files") 4.10 4.11 $(boldify $(gettext "Examples:"))