SliTaz Repositories

     1.1 --- a/lib/libspk.sh	Sat May 19 03:51:05 2012 -0500
     1.2 +++ b/lib/libspk.sh	Sat May 19 04:59:02 2012 -0500
     1.3 @@ -83,6 +83,10 @@
     1.4  	cd - >/dev/null
     1.5  }
     1.6  
     1.7 +is_package_installed() {
     1.8 +	[ -d "$installed/$1" ]
     1.9 +}
    1.10 +
    1.11  # Used by: list
    1.12  count_installed() {
    1.13  	local count=$(ls $installed | wc -l)

     2.1 --- a/spk	Sat May 19 03:51:05 2012 -0500
     2.2 +++ b/spk	Sat May 19 04:59:02 2012 -0500
     2.3 @@ -120,13 +120,13 @@
     2.4  				check_root
     2.5  				[ -d "$installed/$pkg" ] || continue
     2.6  				if grep -qs ^${pkg}$ $blocked; then
     2.7 -					echo -n "$(boldify $pkg) "
     2.8 -					gettext "is already blocked"; newline
     2.9 +					echo $(boldify $pkg) $(gettext "is already blocked")
    2.10  				else
    2.11  					gettext "Blocking package:"; echo -n " $pkg"
    2.12  					echo $pkg >> $blocked
    2.13  					log "Blocked package: $pkg" && status
    2.14 -				fi && continue ;;
    2.15 +				fi
    2.16 +				continue ;;
    2.17  			*\ --unblock\ *)
    2.18  				check_root
    2.19  				[ -d "$installed/$pkg" ] || continue
    2.20 @@ -135,11 +135,11 @@
    2.21  					sed -i /"^${pkg}$"/d $blocked
    2.22  					log "Unblocked package: $pkg" && status
    2.23  				else
    2.24 -					echo -n "$(boldify $pkg) "
    2.25 -					gettext "is not blocked"; newline
    2.26 -				fi && continue ;;
    2.27 +					echo $(boldify $pkg) $(gettext "is not blocked")
    2.28 +				fi
    2.29 +				continue ;;
    2.30  			*\ --rm\ *)
    2.31 -				[ -d "$installed/$pkg" ] || continue
    2.32 +				is_package_installed $pkg || continue
    2.33  				spk-rm $pkg --count=$count
    2.34  				count=$(($count + 1))
    2.35  				continue ;;
    2.36 @@ -161,13 +161,14 @@
    2.37  				else
    2.38  					colorize 36 $(gettext "Any upgrade log for:"; echo " $pkg")
    2.39  					newline
    2.40 -				fi && continue ;;
    2.41 +				fi
    2.42 +				continue ;;
    2.43  		esac
    2.44  		count=$(($count + 1))
    2.45  		[ "$count" == 1 ] && newline
    2.46  		unset_receipt
    2.47  		. $installed/$pkg/receipt
    2.48 -		boldify "$(gettext "Package") $pkg"
    2.49 +		boldify $(gettext "Package") $pkg
    2.50  		separator
    2.51  		gettext "Status     :"; colorize 32 " installed"
    2.52  		receipt_info
    2.53 @@ -186,13 +187,16 @@
    2.54  		esac
    2.55  		count=$(($count + 1))
    2.56  		[ "$count" == 1 ] && newline
    2.57 -		boldify "$(gettext "Package") $pkg"
    2.58 +		boldify $(gettext "Package") $pkg
    2.59  		separator
    2.60  		gettext "Status     :"; colorize 31 " not installed"
    2.61 -		echo "$mirrored" | awk 'BEGIN { FS = "|" } ; { print \
    2.62 -			"Version    :" $2 "\n" \
    2.63 -			"Short desc :" $3 "\n" \
    2.64 -			"Category   :" $4 }'
    2.65 +		IFS="|"
    2.66 +		local mirror_version mirror_desc empty mirror_cat
    2.67 +		echo "$mirrored" | read empty mirror_version mirror_desc empty mirror_cat
    2.68 +		echo "Version    :" $mirror_version
    2.69 +		echo "Short desc :" $mirror_desc
    2.70 +		echo "Category   :" $mirror_cat
    2.71 +		unset IFS
    2.72  		separator && newline
    2.73  		continue
    2.74  	fi

     3.1 --- a/spk-add	Sat May 19 03:51:05 2012 -0500
     3.2 +++ b/spk-add	Sat May 19 04:59:02 2012 -0500
     3.3 @@ -34,7 +34,9 @@
     3.4  }
     3.5  
     3.6  # Log install messages
     3.7 +# Parameters: package
     3.8  log_install() {
     3.9 +	local pkg=$1
    3.10  	debug "log_install: $logdir/$pkg/install.log"
    3.11  	mkdir -p $logdir/$pkg
    3.12  	tee $logdir/$pkg/install.log
    3.13 @@ -85,12 +87,8 @@
    3.14  			gettext "Install missing dependencies"
    3.15  			if ! confirm; then
    3.16  				gettext "WARNING: Any dependencies installed"; newline
    3.17 -			else
    3.18 -				install_deps $package_name $DEPENDS
    3.19  			fi
    3.20 -		else
    3.21  			install_deps $package_name $DEPENDS
    3.22 -		fi
    3.23  	else
    3.24  		newline
    3.25  	fi
    3.26 @@ -367,7 +365,7 @@
    3.27  	case "$pkg" in
    3.28  		*.tazpkg|*.spk)
    3.29  			count=$(($count + 1))
    3.30 -			install_local $pkg | log_install ;;
    3.31 +			install_local $pkg | log_install $pkg;;
    3.32  		*.deb|.rmp)
    3.33  			echo "TODO: spk-convert then install" ;;
    3.34  		*.*) gettext "WARNING: Not a valid package:"; echo " $pkg" ;;
    3.35 @@ -375,7 +373,7 @@
    3.36  		*)
    3.37  			[ "$forced" ] || check_installed $pkg
    3.38  			count=$(($count + 1))
    3.39 -			install_web $pkg | log_install ;;
    3.40 +			install_web $pkg | log_install $pkg;;
    3.41  	esac
    3.42  done
    3.43  

     4.1 --- a/spk-ls	Sat May 19 03:51:05 2012 -0500
     4.2 +++ b/spk-ls	Sat May 19 04:59:02 2012 -0500
     4.3 @@ -73,8 +73,8 @@
     4.4  					separator
     4.5  					read_pkgsdesc $extra/packages.desc
     4.6  					separator
     4.7 -					boldify $(echo -n "$(cat $extra/packages.$SUM | wc -l) "
     4.8 -					gettext "packages in:"; echo " $(basename $extra)")
     4.9 +					boldify $(echo -n $(cat $extra/packages.$SUM | wc -l))
    4.10 +					gettext "packages in:"; echo " $(basename $extra)"
    4.11  					newline
    4.12  				done
    4.13  				exit 0 ;;
    4.14 @@ -83,7 +83,8 @@
    4.15  				cat $blocked
    4.16  			else
    4.17  				gettext "No blocked packages"; newline
    4.18 -			fi && exit 0 ;;
    4.19 +			fi
    4.20 +			exit 0 ;;
    4.21  		--short)
    4.22  			newline
    4.23  			boldify $(gettext "Installed packages")
    4.24 @@ -91,11 +92,12 @@
    4.25  			for pkg in $(ls -1 $installed)
    4.26  			do
    4.27  				. $installed/$pkg/receipt
    4.28 -				echo -n "$(colorize 32 $pkg)"; indent 28 " $VERSION"
    4.29 +				echo $(colorize 32 $pkg); indent 28 " $VERSION"
    4.30  			done
    4.31  			separator
    4.32  			boldify $(count_installed)
    4.33 -			newline && exit 0 ;;
    4.34 +			newline
    4.35 +			exit 0 ;;
    4.36  		--*) continue ;;
    4.37  		*)
    4.38  			# List installed files by the package.
    4.39 @@ -115,18 +117,18 @@
    4.40  						cat $modifiers
    4.41  						separator && newline
    4.42  					else
    4.43 -						echo -n "$(boldify $pkg) "
    4.44 -						gettext "package was not modified"; newline
    4.45 +						echo $(boldify $pkg) $(gettext "package was not modified")
    4.46  					fi
    4.47  					continue
    4.48  				fi
    4.49 -				boldify $(gettext "Installed files by"; echo " $pkg")
    4.50 +				boldify $(gettext "Installed files by") $pkg
    4.51  				separator
    4.52  				cat $installed/$pkg/files.list
    4.53  				separator
    4.54 -				gettext "Installed files by"; echo -n " $pkg: "
    4.55 -				colorize 32 "$nb" && newline
    4.56 -			done && exit 0 ;;
    4.57 +				echo $(gettext "Installed files by") $pkg: 
    4.58 +				colorize 32 $nb && newline
    4.59 +			done
    4.60 +			exit 0 ;;
    4.61  	esac
    4.62  done
    4.63  
    4.64 @@ -137,7 +139,7 @@
    4.65  count=0
    4.66  
    4.67  newline
    4.68 -boldify "$(gettext "Installed packages")"
    4.69 +boldify $(gettext "Installed packages")
    4.70  separator
    4.71  for pkg in $installed/*
    4.72  do

     5.1 --- a/spk-mirror	Sat May 19 03:51:05 2012 -0500
     5.2 +++ b/spk-mirror	Sat May 19 04:59:02 2012 -0500
     5.3 @@ -65,8 +65,8 @@
     5.4  	local db=$1
     5.5  	debug "extra DB: $extradb/$db"
     5.6  	nb=$(cat $extradb/$db/packages.$SUM 2>/dev/null | wc -l)
     5.7 -	echo -n "Extra DB  :"; boldify " $db"
     5.8 -	echo -n "Extra URL :"; echo " $(cat $extradb/$db/mirror)"
     5.9 +	echo "Extra DB  : "$(boldify $db)
    5.10 +	echo "Extra URL : "$(cat $extradb/$db/mirror)
    5.11  	gettext "Packages  :"; colorize 32 " $nb"
    5.12  }
    5.13  
    5.14 @@ -79,13 +79,14 @@
    5.15  	# Add PACKED_SIZE UNPACKED_SIZE to know packages size
    5.16  	# before installing ??? --> actually done via packages.txt
    5.17  	#
    5.18 -	cat >> packages.desc << EOT
    5.19 -$PACKAGE | ${VERSION}$EXTRAVERSION | $SHORT_DESC | $CATEGORY | $WEB_SITE
    5.20 -EOT
    5.21 +	
    5.22 +	echo "$PACKAGE | ${VERSION}$EXTRAVERSION | $SHORT_DESC | $CATEGORY | $WEB_SITE" \
    5.23 +	>> packages.desc
    5.24 +	
    5.25  	# packages.equiv is used by tazpkg install to check depends.
    5.26  	touch packages.equiv
    5.27  	for i in $PROVIDE; do
    5.28 -		dest=""
    5.29 +		unset dest
    5.30  		echo $i | fgrep -q : && dest="${i#*:}:"
    5.31  		if grep -qs ^${i%:*}= packages.equiv; then
    5.32  			sed -i "s/^${i%:*}=/${i%:*}=${dest}$PACKAGE /" packages.equiv
    5.33 @@ -95,6 +96,7 @@
    5.34  	done
    5.35  	# files.list provides a list of all packages files.
    5.36  	cat $tmpdir/files.list | sed s/^/"$PACKAGE: \0"/ >> $pkgsdir/files.list
    5.37 +	cd - > /dev/null
    5.38  }
    5.39  
    5.40  #
    5.41 @@ -261,7 +263,7 @@
    5.42  				echo "$pkgsdir/" > $db/mirror
    5.43  				for list in packages.*
    5.44  				do
    5.45 -					gettext "Linking:"; echo -n " $list"
    5.46 +					echo $(gettext "Linking:") $list
    5.47  					ln -s $pkgsdir/$list $db/$list
    5.48  					status
    5.49  				done

     6.1 --- a/spk-rm	Sat May 19 03:51:05 2012 -0500
     6.2 +++ b/spk-rm	Sat May 19 04:59:02 2012 -0500
     6.3 @@ -50,7 +50,7 @@
     6.4  # Remove a single package
     6.5  remove() {
     6.6  	altered=""
     6.7 -	boldify $(gettext "Removing"; echo " $pkg")
     6.8 +	boldify $(gettext "Removing") $pkg
     6.9  	separator
    6.10  	[ "$verbose" ] && echo "DB: $installed"
    6.11  
    6.12 @@ -59,7 +59,7 @@
    6.13  		[ -f $installed/$i/receipt ] || continue
    6.14  		unset_receipt
    6.15  		. $installed/$i/receipt
    6.16 -		case " $(echo $DEPENDS) " in
    6.17 +		case " $DEPENDS " in
    6.18  			*\ $pkg\ *) altered="$altered $i" ;;
    6.19  		esac
    6.20  	done