add function to use custom repo and alias file

INSTALL.sh

@@ -16,7 +16,8 @@ install -dm777 ${DESTDIR}${CACHE_DIR}/packages
 install -dm777 ${DESTDIR}${CACHE_DIR}/sources
 install -dm777 ${DESTDIR}${CACHE_DIR}/work
 
-install -m755 xchroot revdep pkgadd pkgdel pkgbuild pkgquery scratch updateconf ${DESTDIR}${BINDIR}
+install -m755 xchroot revdep pkgadd pkgdel pkgbuild pkgquery scratch updateconf \
+              pkgbase pkgdepends pkgrebuild pkgfix portcreate ${DESTDIR}${BINDIR}
 install -m644 scratchpkg.conf scratchpkg.repo scratchpkg.alias ${DESTDIR}${CONFDIR}
 
 install -m644 revdep.conf ${DESTDIR}${REVDEPCONF}

pkgbase

@@ -0,0 +1,58 @@
+#!/bin/sh
+#
+# script to remove all packages other than base and any user input
+#
+
+parseopt() {
+	while [ "$1" ]; do
+		case $1 in
+			-n) dryrun=1;;
+			-y) yes=$1;;
+			-h) printhelp; exit 0;;
+			*)  pkg="$pkg $1"
+		esac
+		shift
+	done
+}
+
+printhelp() {
+	cat << EOF
+Usage:
+  $(basename $0) [options] [packages]
+  
+Options:
+  -n  dry-run
+  -y  dont ask user confirmation
+  -h  print this help msg
+  
+EOF
+}
+
+error=0
+
+parseopt "$@"
+
+echo "Calculate packages to keep..."
+keep=$(scratch deplist base $pkg | awk '{print $2}')
+
+echo "Calculate selected packages to remove..."
+for pkg in $(scratch installed | awk '{print $1}'); do
+	echo $keep | tr ' ' '\n' | grep -qx $pkg || {
+		remove="$remove $pkg"
+	}
+done
+
+[ "$remove" ] && {
+	[ "$dryrun" = 1 ] && {
+		for i in $remove; do
+			echo "remove: $i..."
+		done
+		echo "This is dry-run, no real action is run!"
+	} || {
+		scratch remove $yes $remove || error=1
+	}
+} || {
+	echo "Already on base, nothing to remove."
+}
+
+exit $error

pkgbuild

@@ -98,9 +98,14 @@ download_src() {
 			FILENAME=$(basename $FILE)
 			SRCURL=$FILE
 		fi
+		[ "$DOWNLOAD_PROG" = "auto" ] && {
+			command -v curl >/dev/null && DOWNLOAD_PROG=curl
+			command -v wget >/dev/null && DOWNLOAD_PROG=wget
+		}
 		case $DOWNLOAD_PROG in
 			curl) DLCMD="curl -C - -L --fail --ftp-pasv --retry 3 --retry-delay 3 -o $SOURCE_DIR/$FILENAME.partial $CURL_OPTS" ;;
 			wget) DLCMD="wget -c --passive-ftp --no-directories --tries=3 --waitretry=3 --output-document=$SOURCE_DIR/$FILENAME.partial $WGET_OPTS" ;;
+			*) msgerr "No download agent found"; abort 1;;
 		esac
 		if [ "$FILENAME" != "$FILE" ]; then
 			if [ ! -f "$SOURCE_DIR/$FILENAME" ] || [ "$REDOWNLOAD_SOURCE" ]; then
@@ -306,7 +311,8 @@ removelocales() {
 		usr/share/locale \
 		usr/locale \
 		usr/local/locale \
-		usr/local/share/locale
+		usr/local/share/locale \
+		usr/lib/locale
 }
 
 packaging() {
@@ -691,7 +697,7 @@ PKGBUILD_BSCRIPT="spkgbuild"
 SOURCE_DIR="/var/cache/scratchpkg/sources"
 PACKAGE_DIR="/var/cache/scratchpkg/packages"
 WORK_DIR="/var/cache/scratchpkg/work"
-DOWNLOAD_PROG="wget"
+DOWNLOAD_PROG="auto"
 COMPRESSION_MODE="xz"
 
 OPTIONS="!libtool emptydirs strip zipman buildflags makeflags checksum !docs !locales"

pkgdepends

@@ -0,0 +1,55 @@
+#!/bin/sh
+
+#
+# script to check dependencies
+#
+
+get_libpath() {
+	ldd $1 2>/dev/null | grep $2 | awk '{print $3}'
+}
+
+scratch files $1 | while read -r line; do
+	case $line in
+		usr/share/gir-1.0/*.gir) extra_dep="$extra_dep gobject-introspection";;
+		usr/share/vala/vapi/*.vapi) extra_dep="$extra_dep vala";;
+	esac
+	case $line in
+		*/) continue;;
+	esac
+	case "$(file -bi /$line)" in
+		*application/x-sharedlib* | *application/x-executable* | *application/x-pie-executable*)
+			for NEEDED in $(objdump -x /$line | grep NEEDED | awk '{print $2}'); do
+				case $NEEDED in
+					libc.so|libc.so.6) continue;;
+				esac
+				[ "$NEEDED" ] || continue
+				[ -f /"$line" ] || continue
+				libs=$(get_libpath /$line $NEEDED)
+				[ "$libs" ] || continue
+				if ! echo $all_libs | grep -qw $libs; then
+					pkg=$(scratch provide $libs$ | awk '{print $1}' | head -n1)
+					case $pkg in
+						$1|gcc|glibc|musl) continue;;
+					esac
+					[ "$pkg" ] || continue
+					if ! echo $all_pkgs | grep -qw $pkg; then
+						echo $pkg
+						all_pkgs="$all_pkgs $pkg"
+						unset pkg
+					fi
+					all_libs="$all_libs $libs"
+					unset libs
+				fi
+			done ;;
+	esac
+	[ "$extra_dep" ] && {
+		for e in $extra_dep; do
+			if ! echo $all_pkgs | grep -qw $e; then
+				echo $e
+				all_pkgs="$all_pkgs $e"
+			fi
+		done
+	}
+done
+
+exit 0

pkgfix

@@ -0,0 +1,140 @@
+#!/bin/sh
+#
+#  Copyright (c) 2019 by Emmett1  (emmett1.2miligrams@gmail.com)
+#
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+#
+#
+#  script to detect broken kernel modules after kernel update
+#  need to use with 'scratchpkg'
+#
+
+export LANG=C
+
+get_perlmodules() {
+	command -v perl >/dev/null || return
+	perlpath=$(dirname $(perl -V:sitearch | grep -o "'.*'" | sed "s/'//g"))
+	for i in $(dirname $perlpath)/*; do
+		[ "$perlpath" = "$i" ] && continue	
+		brokenpkg="$brokenpkg $(scratch provide $i/$ | awk '{print $1}')"
+	done
+}
+
+get_modules() {
+	[ -f /lib/modules/KERNELVERSION ] || return
+	KERVER=$(cat /lib/modules/KERNELVERSION)
+	for i in /lib/modules/*; do
+		case $i in
+			/lib/modules/KERNELVERSION|/lib/modules/$KERVER) continue ;;
+		esac
+		brokenpkg="$brokenpkg $(scratch provide $i/$ | awk '{print $1}')"
+	done
+}
+
+get_rubygem() {
+	command -v gem >/dev/null || return
+	gempath=$(gem env gemdir)
+	for i in $(dirname $gempath)/*; do
+		[ "$gempath" = "$i" ] && continue
+		brokenpkg="$brokenpkg $(scratch provide $i/$ | awk '{print $1}')"
+	done
+}
+
+sort_modules() {
+	for all in $(scratch deplist $brokenpkg | cut -d ' ' -f2); do
+		for r in $brokenpkg; do
+			if [ $r = $all ]; then
+				if [ -z "$order" ]; then
+					order="$all"
+				else
+					order="$order $all"
+				fi
+				break
+			fi
+		done
+	done
+}
+
+confirm() {
+	printf "$1 (Y/n) "
+	read -r response
+	case "$response" in
+		[Nn][Oo]|[Nn]) echo "$2"; return 2 ;;
+		*) : ;;
+	esac
+	return 0
+}
+
+usage() {
+	cat << EOF
+Usage:
+  $(basename $0) [options]
+  
+Options:
+  -r     rebuild & reinstall broken package
+  -y     dont ask user confirmation to rebuild package (use with -r)
+  -h     print this help message
+
+EOF
+}
+
+parse_opt() {
+	while [ "$1" ]; do
+		case $1 in
+			-r) REBUILD=1 ;;
+			-y) YES=1 ;;
+			-h) usage; exit 0 ;;
+			*)  echo "Invalid option ($1)"; exit 1 ;;
+		esac
+		shift
+	done
+}
+
+parse_opt $@
+
+if [ "$REBUILD" ] && [ "$(id -u)" != 0 ]; then
+	echo "Rebuild broken packages required root!"
+	exit 1
+fi
+
+get_modules
+get_perlmodules
+get_rubygem
+
+if [ "$brokenpkg" ]; then
+	sort_modules
+else
+	echo "No broken packages found."
+	exit 0
+fi
+
+if [ "$REBUILD" = 1 ]; then
+	[ "$YES" ] || {
+		echo
+		echo "Package will be rebuild & reinstall by this order:"
+		echo " $order"
+		echo
+		confirm "Continue rebuild & reinstall broken packages?" "Operation cancelled."
+	}
+	for p in $order; do
+		scratch build -f $p && scratch install -r $p || exit 1
+	done
+else
+	echo "Broken packages:"
+	for p in $order; do
+		echo " $p"
+	done
+fi
+
+exit 0

pkgquery

@@ -18,342 +18,6 @@
 #  along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-msg() {
-	echo "==> $1"
-}
+echo "*** ${0##*/} is deprecated, please use 'scratch' instead ***"
 
-msgerr() {
-	msg "ERROR: $*"
-}
-
-msgwarn() {
-	msg "WARNING: $*"
-}
-
-msginst() {
-	echo "[i] $1"
-}
-
-msgmiss() {
-	echo "[m] $1"
-}
-
-msgnoinst() {
-	echo "[-] $1"
-}
-
-needarg() {
-	[ "$*" ] || {
-		msgerr "This operation required an arguments!"
-		exit 1
-	}
-}
-
-isinstalled() {
-	if [ -s "$INDEX_DIR/$1/.pkginfo" ] && [ "$(grep $1 $INDEX_DIR/$1/.pkginfo)" ]; then
-		return 0
-	else
-		return 1
-	fi
-}
-
-allinstalled() {	
-	grep ^name "$INDEX_DIR"/*/.pkginfo | awk '{print $3}'
-}
-
-installed_pkg_info() {	
-	if isinstalled $1; then
-		grep ^$2 "$INDEX_DIR/$1/.pkginfo" | cut -d " " -f3-
-	fi
-}
-
-deps_alias() {
-	[ -f $ALIAS_FILE ] || {
-		echo $@
-		return
-	}
-	while [ "$1" ]; do
-		getalias=$(grep -w ^$1 $ALIAS_FILE | awk '{print $2}')
-		echo ${getalias:-$1}
-		shift
-	done
-	unset getalias
-}
-
-getdepends() {
-	ppath=$(getportpath $1) || return 0
-	deps=$(grep "^# depends[[:blank:]]*:" $ppath/$BUILD_SCRIPT \
-	| sed 's/^# depends[[:blank:]]*:[[:blank:]]*//' \
-	| tr ' ' '\n' \
-	| awk '!a[$0]++' \
-	| sed 's/,//')
-	deps_alias $deps
-}
-
-getportpath() {
-	for repo in $REPO; do
-		if [ -f $repo/$1/$BUILD_SCRIPT ]; then
-			dirname $repo/$1/$BUILD_SCRIPT
-			return 0
-		fi
-	done
-	return 1	
-}
-
-pkg_dependent() {
-	needarg $@
-	if [ "$(getportpath $1)" ]; then
-		grep -R "# depends[[:blank:]]*:" $REPO \
-		| sed "s,:# depends[[:blank:]]*:[[:blank:]]*,#|,;s, ,|,g;s,$,|,g" \
-		| grep "|$1|" \
-		| awk -F "#" '{print $1}' \
-		| rev \
-		| awk -F / '{print $2}' \
-		| rev
-	else
-		msgerr "Port '$1' not exist."
-		return 1
-	fi
-}
-
-pkg_orphan() {
-	tmpallpkg="/tmp/.pkgquery_allpkg.$$"
-	tmpalldep="/tmp/.pkgquery_alldep.$$"
-	for pkg in $(allinstalled); do
-		echo $pkg >> $tmpallpkg
-		dep="$dep $(getdepends $pkg)"
-	done
-	echo $dep | tr ' ' '\n' | sort | uniq > "$tmpalldep"
-	grep -xvF -f "$tmpalldep" "$tmpallpkg"
-	rm "$tmpalldep" "$tmpallpkg"
-}
-
-pkg_dup() {	
-	dup=$(find $REPO -type d -print | grep -Exv "($(echo $REPO | tr ' ' '|'))" | \
-		rev | cut -d '/' -f1 | rev | sort | uniq -d)
-	
-	if [ "$dup" ]; then
-		for dp in $dup; do
-			for repo in $REPO; do
-				[ -d $repo/$dp ] && echo "$repo/$dp"
-			done
-		done
-	else
-		msg "No duplicate ports found."
-	fi	
-}
-
-pkg_foreign() {
-	for pkg in $(allinstalled); do
-		if ! getportpath $pkg >/dev/null; then
-			iname=$(installed_pkg_info $pkg name)
-			iversion=$(installed_pkg_info $pkg version)
-			irelease=$(installed_pkg_info $pkg release)
-			echo "$iname $iversion-$irelease"
-		fi
-		unset iname iversion irelease
-	done	
-}
-
-pkg_search() {
-	needarg $@
-	arg=$*
-	for repo in $REPO; do
-		out=$(grep -R "# description" $repo | grep $BUILD_SCRIPT | grep "$arg" | awk -F : '{print $1}' | sort)
-		[ "$out" ] || continue
-		for line in $out; do
-			repo=$(echo $line | rev | awk -F / '{print $3}' | rev)
-			desc=$(grep "^# description[[:blank:]]*:" $line | sed 's/^# description[[:blank:]]*:[[:blank:]]*//')
-			. $line
-			echo "($repo) $name $version-$release: $desc"
-			unset repo desc name version release build
-		done
-		unset out
-	done
-}
-
-pkg_locked() {
-	for pkg in $(allinstalled); do
-		[ -f "$INDEX_DIR/$pkg/.lock" ] && echo "$pkg"
-	done
-}
-
-pkg_installed() {
-	for all in $(allinstalled); do		
-		printf "%s" "$all "
-		grep -e ^version -e ^release $INDEX_DIR/$all/.pkginfo | awk '{print $3}' | tr '\n' '-' | sed 's:\-$::'
-		echo
-	done
-}
-
-pkg_missingdep() {
-	for pkg in $(allinstalled); do
-		if getportpath "$pkg" >/dev/null; then
-			depends=$(getdepends $pkg)
-		fi
-		if [ "$depends" ]; then
-			for d in $depends; do
-				if ! isinstalled $d; then
-					if [ -z "$msd" ]; then
-						msd="$d"
-					else
-						msd="$msd $d"
-					fi
-				fi
-			done
-		fi
-		[ "$msd" ] && echo "$pkg: $msd"
-		unset depends msd
-	done
-}
-
-pkg_info() {
-	needarg $@
-	ppath=$(getportpath $1) || return 1
-	
-	. $ppath/$BUILD_SCRIPT
-	desc=$(grep "^# description[[:blank:]]*:" $ppath/$BUILD_SCRIPT | sed 's/^# description[[:blank:]]*:[[:blank:]]*//')
-	url=$(grep "^# homepage[[:blank:]]*:" $ppath/$BUILD_SCRIPT | sed 's/^# homepage[[:blank:]]*:[[:blank:]]*//')
-	maint=$(grep "^# maintainer[[:blank:]]*:" $ppath/$BUILD_SCRIPT | sed 's/^# maintainer[[:blank:]]*:[[:blank:]]*//')
-	deps=$(getdepends $1 | tr '\n' ' ')
-	
-	echo "Name:         $1"
-	echo "Path:         $ppath"
-	echo "Version:      $version"
-	echo "Release:      $release"
-	echo "Description:  $desc"
-	echo "Homepage:     $url"
-	echo "Maintainer:   $maint"
-	echo "Dependencies: $deps"
-}
-
-pkg_depends() {
-	needarg $@	
-	if getportpath "$1" >/dev/null; then
-		depends=$(getdepends $1)
-	else
-		msgerr "Port '$1' not exist."
-		return 1
-	fi
-	
-	for dep in $depends; do
-		if isinstalled $dep; then
-			msginst "$dep"
-		elif getportpath $dep >/dev/null; then
-			msgnoinst "$dep"
-		else
-			msgmiss "$dep"
-		fi
-	done
-}
-
-pkg_path() {
-	needarg $@
-	if PPATH=$(getportpath "$1"); then
-		echo "$PPATH"
-	else
-		msgerr "Port '$1' not exist."
-		return 1
-	fi
-}
-
-pkg_provide() {
-	needarg $@
-	arg=$(echo $1 | sed "s/^\///")
-	grep -R "$arg" $INDEX_DIR/*/.files \
-	| sed "s:$INDEX_DIR/::" \
-	| sed "s:/.files::" \
-	| tr : " " \
-	| column -t
-}
-
-pkg_readme() {
-	needarg $@	
-	if PPATH=$(getportpath "$1"); then
-		if [ -f "$PPATH/readme" ]; then
-			cat "$PPATH/readme"
-		else
-			msgerr "Port '$1' does not have readme."
-		fi
-	else
-		msgerr "Port '$1' not exist."
-		exit 1
-	fi
-}
-
-pkg_files() {	
-	needarg $@
-	if isinstalled $1; then
-		cat "$INDEX_DIR/$1/.files"
-	else
-		msg "Package '$1' not installed."
-	fi	
-}
-
-pkg_cat() {	
-	needarg $@
-	if PPATH=$(getportpath "$1"); then
-		cat "$PPATH/$BUILD_SCRIPT"
-	else
-		msgerr "Port '$1' not exist."
-		return 1
-	fi
-}
-
-pkg_help() {
-	cat << EOF
-Usage:
-    $(basename $0) <options> [<arg>]
-    
-Options:
-    search    <pattern>    find ports in repo
-    cat       <port>       print spkgbuild
-    depends   <port>       print dependencies
-    dependent <port>       print dependent
-    path      <port>       print path in repo
-    provide   <files>      print port's provided files
-    readme    <port>       print readme file, if exist
-    files     <port>       print files installed
-    info      <port>       print information
-    dup                    print duplicate ports in repo
-    installed              print all installed ports
-    locked                 print loacked ports
-    missingdep             print missing dependencies
-    orphan                 print orphan installed ports
-    foreign                print foreign ports
-    help                   print this help msg
-    
-EOF
-}
-
-print_runhelp_msg() {
-	echo "Run '$(basename $0) help' to see available options."
-	exit 2
-}
-
-BUILD_SCRIPT="spkgbuild"
-INDEX_DIR="/var/lib/scratchpkg/index"
-REPO_FILE="/etc/scratchpkg.repo"
-ALIAS_FILE="/etc/scratchpkg.alias"
-
-if [ -f "$REPO_FILE" ]; then
-	for repodir in $(grep -Ev '^(#|$)' "$REPO_FILE" | awk '{print $1}'); do
-		REPO="$REPO $repodir"
-	done
-fi
-
-opts=$1
-
-if [ -z "$opts" ]; then
-	print_runhelp_msg
-fi
-
-shift
-
-if [ $(command -v pkg_$opts) ]; then
-	pkg_$opts "$@"
-else
-	print_runhelp_msg
-fi
-
-exit $?
+exit 0

pkgrebuild

@@ -0,0 +1,33 @@
+#!/bin/sh
+#
+# script to rebuild base packages in right toolchain order
+#
+
+LIST="/tmp/$(basename $0)-list"
+touch $LIST
+
+TOOLCHAIN="linux-api-headers glibc-pass1 binutils-pass1 gcc binutils glibc"
+
+#scratch sync || exit 1
+
+for tc in $TOOLCHAIN; do
+	if [ ! $(grep -x $tc $LIST) ]; then
+		pkgname="$(echo $tc | sed 's/-pass1//')"
+		scratch build -f $pkgname || exit 1
+		echo $tc >> $LIST
+		scratch install -r $pkgname --no-backup || exit 1
+	fi
+done	
+
+for pkg in $(scratch deplist base | awk '{print $2}'); do
+	case $pkg in
+		linux-api-headers|musl|gcc|binutils|glibc) continue;;
+	esac
+	if [ ! $(grep -x $pkg $LIST) ]; then
+		scratch build -f $pkg || exit 1
+		echo $pkg >> $LIST
+		scratch install -r $pkg --no-backup || exit 1
+	fi
+done
+
+exit 0

portcreate

@@ -0,0 +1,48 @@
+#!/bin/sh
+#
+#  scratchpkg
+#
+#  Copyright (c) 2018 by Emmett1  (emmett1.2miligrams@gmail.com)
+#
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+#
+
+if [ -d "$1" ]; then
+	echo "ERROR: Directory '$1' already exist!"
+	exit 1
+else
+	mkdir "$1"
+	echo "# description	: 
+# homepage	: 
+# maintainer	: 
+# depends	: 
+
+name=$1
+version=
+release=1
+options=\"\"
+noextract=\"\"
+backup=\"\"
+source=\"\"
+
+build() {
+	cd \$name-\$version
+	./configure --prefix=/usr
+	make
+	make DESTDIR=\$PKG install
+}" > "$1"/spkgbuild
+	echo "Template port have created for '$1'."
+fi
+
+exit 0

scratch

@@ -100,16 +100,20 @@ allinstalled() {
 }
 
 deps_alias() {
-	[ -f $ALIAS_FILE ] || {
+	[ -f "$ALIAS_FILE" ] || {
 		echo $@
 		return
 	}
 	while [ "$1" ]; do
-		getalias=$(grep -w ^$1 $ALIAS_FILE | awk '{print $2}')
-		echo ${getalias:-$1}
+		if [ "$(grep -w ^$1 $ALIAS_FILE)" ]; then
+			getalias=$(grep -w ^$1 $ALIAS_FILE | awk '{print $2}')
+			[ "$getalias" ] && echo "$getalias"
+		else
+			echo "$1"
+		fi
 		shift
+		unset getalias
 	done
-	unset getalias
 }
 
 get_depends() {
@@ -206,6 +210,13 @@ scratch_lock() {
 	done	
 }
 
+scratch_locate() {
+	needarg $@
+	for repo in $PORT_REPO; do
+		grep -R $@ $repo/*/.pkgfiles | sed 's/:/ /;s/\/\.pkgfiles//' | awk '{print $1,$4}' | column -t
+	done
+}
+
 scratch_unlock() {
 	needroot "Unlocking package"	
 	for pkg in "$@"; do
@@ -797,78 +808,79 @@ scratch_upgrade() {
 	}
 	for pkg in $PKGNAME; do
 		if ! isinstalled $pkg; then
-			msgerr "Package '$pkg' not installed."
+			echo "Package '$pkg' not installed."
 			continue
 		elif [ ! $(getportpath $pkg) ]; then
-			msgerr "Package '$pkg' not exist."
+			echo "Package '$pkg' not exist."
 			continue
 		else
 			. $(getportpath $pkg)/$BUILD_SCRIPT
 			if [ "$(installed_pkg_info version $pkg)-$(installed_pkg_info release $pkg)" = "$version-$release" ]; then
-				msg "Package '$pkg' is up to date."
+				echo "Package '$pkg' is up to date."
 				continue
 			fi
 		fi
 		upkg="$upkg $pkg"
 	done
 	[ "$upkg" ] || return 0
-	[ "$NO_DEP" ] || {
+	
+	UPGPKG=0
+	NEWPKG=0	
+	if [ "$NODEP" != 1 ]; then
 		echo "Resolving dependencies..."
 		DEP=$(scratch_deplist $upkg $EXOPT | awk '{print $2}')
-		for dep in $DEP; do
-			if ! isinstalled $dep; then
-				[ "$(getportpath $dep)" ] && newpkg="$newpkg $dep"
+		echo
+		for d in $DEP; do
+			if [ "$(echo $upkg | tr ' ' '\n' | grep -x $d)" = "$d" ]; then
+				printf "[${GREEN}u${CRESET}] $d  "
+				WILLINSTALL="$WILLINSTALL $d"
+				UPGPKG=$(( UPGPKG + 1 ))
+			elif ! isinstalled $d && [ "$(getportpath "$d")" ]; then
+				printf "[${CYAN}n${CRESET}] $d  "
+				WILLINSTALL="$WILLINSTALL $d"
+				NEWPKG=$(( NEWPKG + 1 ))
 			fi
 		done
-	}
-	echo
-	tnew=0
-	tup=0
-	for i in $newpkg; do
-		tnew=$(( tnew + 1 ))
-		printf "[${CYAN}n${CRESET}] $i  "
-	done
-	for i in $upkg; do
-		tup=$(( tup + 1 ))
-		printf "[${GREEN}u${CRESET}] $i  "
-	done
+	else
+		echo
+		for dd in $upkg; do
+			printf "[${GREEN}u${CRESET}] $dd  "
+			WILLINSTALL="$WILLINSTALL $dd"
+			UPGPKG=$(( UPGPKG + 1 ))
+		done
+	fi
 	echo; echo
-	echo "( $tup upgrade, $tnew new install )"
+	echo "( $UPGPKG upgrade, $NEWPKG new install )"
 	echo
 	[ "$NOCONFIRM" ] || {
 		confirm "Continue upgrade/install these package(s)?" "Package upgrade cancelled." || exit $?
 		echo
 	}
-	total=$(( tup + tnew ))
-	count=0
 	error=0
-	if [ "$newpkg" ]; then
-		for pkg in $newpkg; do	
-			count=$(( count + 1 ))		
-			cd $(getportpath $pkg)
-				settermtitle "[ $count/$total ] Installing $pkg..."
-				pkgbuild -i $OPTS || {
-					error=1
-					count=$(( count - 1 ))
-					break
-				}
-				done_pkg="$done_pkg $pkg"
-			cd - >/dev/null
-		done
-	fi
-	for pkg in $upkg; do # upgrade all target packages
+	count=0
+	total=$(echo $WILLINSTALL | wc -w)
+	for inst in $WILLINSTALL; do # install all required dependencies and target packages itself
 		count=$(( count + 1 ))
-		cd $(getportpath $pkg)
-			settermtitle "[ $count/$total ] Upgrading $pkg..."
+		cd $(getportpath $inst)
+		if ! isinstalled $inst; then
+			settermtitle "[ $count/$total ] Installing $inst..."
+			pkgbuild -i $OPTS || {
+				error=1
+				count=$(( count - 1 ))
+				break
+			}
+		else
+			settermtitle "[ $count/$total ] Upgrading $inst..."
 			pkgbuild -u $OPTS || {
 				error=1
 				count=$(( count - 1 ))
 				break
 			}
-			done_pkg="$done_pkg $pkg"
+		fi
 		cd - >/dev/null
+		done_pkg="$done_pkg $inst"
 	done
-	settermtitle "triggering upgrade hook..."
+	settermtitle "Triggering install hook."
 	[ "$done_pkg" ] && scratch_trigger $done_pkg
 	settermtitle "$count/$total package(s) upgraded."
 	return "$error"
@@ -1130,6 +1142,189 @@ deplist() {
 	CHECK=$(echo $CHECK | sed "s/$1//")
 }
 
+scratch_cat() {	
+	needarg $@
+	if PPATH=$(getportpath "$1"); then
+		cat "$PPATH/$BUILD_SCRIPT"
+	else
+		msgerr "Port '$1' not exist."
+		return 1
+	fi
+}
+
+scratch_dependent() {
+	needarg $@
+	if [ "$(getportpath $1)" ]; then
+		grep -R "# depends[[:blank:]]*:" $PORT_REPO \
+		| sed "s,:# depends[[:blank:]]*:[[:blank:]]*,#|,;s, ,|,g;s,$,|,g" \
+		| grep "|$1|" \
+		| awk -F "#" '{print $1}' \
+		| rev \
+		| awk -F / '{print $2}' \
+		| rev
+	else
+		msgerr "Port '$1' not exist."
+		return 1
+	fi
+}
+
+scratch_depends() {
+	needarg $@	
+	if getportpath "$1" >/dev/null; then
+		depends=$(get_depends $1)
+	else
+		msgerr "Port '$1' not exist."
+		return 1
+	fi
+	
+	for dep in $depends; do
+		if isinstalled $dep; then
+			msginst "$dep"
+		elif getportpath $dep >/dev/null; then
+			msgnoinst "$dep"
+		else
+			msgmiss "$dep"
+		fi
+	done
+}
+
+scratch_dup() {	
+	dup=$(find $PORT_REPO -type d -print | grep -Exv "($(echo $PORT_REPO | tr ' ' '|'))" | \
+		rev | cut -d '/' -f1 | rev | sort | uniq -d)
+	
+	if [ "$dup" ]; then
+		for dp in $dup; do
+			for repo in $PORT_REPO; do
+				[ -d $repo/$dp ] && echo "$repo/$dp"
+			done
+		done
+	else
+		msg "No duplicate ports found."
+	fi	
+}
+
+scratch_foreign() {
+	for pkg in $(allinstalled); do
+		if ! getportpath $pkg >/dev/null; then
+			iname=$(installed_pkg_info name $pkg)
+			iversion=$(installed_pkg_info version $pkg)
+			irelease=$(installed_pkg_info release $pkg)
+			echo "$iname $iversion-$irelease"
+		fi
+		unset iname iversion irelease
+	done	
+}
+
+scratch_info() {
+	needarg $@
+	ppath=$(getportpath $1) || return 1
+	
+	. $ppath/$BUILD_SCRIPT
+	desc=$(grep "^# description[[:blank:]]*:" $ppath/$BUILD_SCRIPT | sed 's/^# description[[:blank:]]*:[[:blank:]]*//')
+	url=$(grep "^# homepage[[:blank:]]*:" $ppath/$BUILD_SCRIPT | sed 's/^# homepage[[:blank:]]*:[[:blank:]]*//')
+	maint=$(grep "^# maintainer[[:blank:]]*:" $ppath/$BUILD_SCRIPT | sed 's/^# maintainer[[:blank:]]*:[[:blank:]]*//')
+	deps=$(get_depends $1 | tr '\n' ' ')
+	
+	echo "Name:         $1"
+	echo "Path:         $ppath"
+	echo "Version:      $version"
+	echo "Release:      $release"
+	echo "Description:  $desc"
+	echo "Homepage:     $url"
+	echo "Maintainer:   $maint"
+	echo "Dependencies: $deps"
+}
+
+scratch_installed() {
+	for all in $(allinstalled); do		
+		printf "%s" "$all "
+		grep -e ^version -e ^release $INDEX_DIR/$all/.pkginfo | awk '{print $3}' | tr '\n' '-' | sed 's:\-$::'
+		echo
+	done
+}
+
+scratch_missingdep() {
+	for pkg in $(allinstalled); do
+		if getportpath "$pkg" >/dev/null; then
+			depends=$(get_depends $pkg)
+		fi
+		if [ "$depends" ]; then
+			for d in $depends; do
+				if ! isinstalled $d; then
+					if [ -z "$msd" ]; then
+						msd="$d"
+					else
+						msd="$msd $d"
+					fi
+				fi
+			done
+		fi
+		[ "$msd" ] && echo "$pkg: $msd"
+		unset depends msd
+	done
+}
+
+scratch_locked() {
+	for pkg in $(allinstalled); do
+		[ -f "$INDEX_DIR/$pkg/.lock" ] && echo "$pkg"
+	done
+}
+
+scratch_orphan() {
+	tmpallpkg="/tmp/.pkgquery_allpkg.$$"
+	tmpalldep="/tmp/.pkgquery_alldep.$$"
+	for pkg in $(allinstalled); do
+		echo $pkg >> $tmpallpkg
+		dep="$dep $(get_depends $pkg)"
+	done
+	echo $dep | tr ' ' '\n' | sort | uniq > "$tmpalldep"
+	grep -xvF -f "$tmpalldep" "$tmpallpkg"
+	rm "$tmpalldep" "$tmpallpkg"
+}
+
+scratch_path() {
+	needarg $@
+	if PPATH=$(getportpath "$1"); then
+		echo "$PPATH"
+	else
+		msgerr "Port '$1' not exist."
+		return 1
+	fi
+}
+
+scratch_provide() {
+	needarg $@
+	arg=$(echo $1 | sed "s/^\///")
+	grep -R "$arg" $INDEX_DIR/*/.files \
+	| sed "s:$INDEX_DIR/::" \
+	| sed "s:/.files::" \
+	| tr : " " \
+	| column -t
+}
+
+scratch_readme() {
+	needarg $@	
+	if PPATH=$(getportpath "$1"); then
+		if [ -f "$PPATH/readme" ]; then
+			cat "$PPATH/readme"
+		else
+			msgerr "Port '$1' does not have readme."
+		fi
+	else
+		msgerr "Port '$1' not exist."
+		exit 1
+	fi
+}
+
+scratch_files() {	
+	needarg $@
+	if isinstalled $1; then
+		cat "$INDEX_DIR/$1/.files"
+	else
+		msg "Package '$1' not installed."
+	fi	
+}
+
 scratch_help() {
 	cat << EOF
 Usage:
@@ -1141,40 +1336,57 @@ Options:
                              -n|--no-dep      skip dependencies
                              -y|--yes         skip ask user permission
                              --exclude=*      exclude dependencies, comma separated
-                             
+
     upgrade <ports> <arg>    upgrade ports (use pkgbuild arg, except '-i' & '-r')
                              -n|--no-dep      skip dependencies
                              -y|--yes         skip ask user permission
                              --exclude=*      exclude dependencies, comma separated
-				             
+
     remove  <ports> <arg>    remove installed ports (use pkgdel arg)
                              -y|--yes         skip ask user permission
-                             
+
     sysup           <arg>    full system upgrade (use pkgbuild arg, except '-i', '-r'  & '-u')
                              -n|--no-dep      skip dependencies
                              -y|--yes         skip ask user permission
                              --exclude=*      exclude dependencies, comma separated
-                             
+
     deplist <ports>          print all dependencies for ports
                              -q|--quick       skip installed ports
                              --exclude=*      exclude dependencies, comma separated
-				
+
     build   <ports> <arg>    build ports (use pkgbuild arg, except '-i', '-u', '-r', '-g', & '-p')
 
-    lock    <ports>          locking ports prevent upgrade
-    unlock  <ports>          unlock locked ports
-    trigger [ports]          run system trigger
+    lock      <ports>        locking ports prevent upgrade
+    unlock    <ports>        unlock locked ports
+    trigger   [ports]        run system trigger
+    search    <pattern>      find ports in repo
+    cat       <port>         print spkgbuild
+    depends   <port>         print dependencies
+    dependent <port>         print dependent
+    path      <port>         print path in repo
+    provide   <files>        print port's provided files
+    readme    <port>         print readme file, if exist
+    files     <port>         print files installed
+    info      <port>         print information
+    locate    <files>        print location of files in ports repo
     sync                     update ports database
-    search  <pattern>        find ports in repo
     outdate                  print outdated ports
     cache                    print and clear old pkg and src caches
     integrity                check installed port integrity
+    dup                      print duplicate ports in repo
+    installed                print all installed ports
+    locked                   print loacked ports
+    missingdep               print missing dependencies
+    orphan                   print orphan installed ports
+    foreign                  print foreign ports
     help                     print this help msg
-    
+
 Global options:
-    --repo=<repo path>       add custom repo path
-    --nocolor                disable colour for output
-    
+    --append-repo=<repo path>       append custom repo path
+    --prepend-repo=<repo path>      prepend custom repo path
+    --repo-file=<repo file>         use custom repo file (default: $REPO_FILE)
+    --nocolor                       disable colour for output
+
 EOF
 }
 
@@ -1183,16 +1395,6 @@ print_runhelp_msg() {
 	exit 2
 }
 
-BUILD_SCRIPT="spkgbuild"
-INDEX_DIR="/var/lib/scratchpkg/index"
-REPO_FILE="/etc/scratchpkg.repo"
-ALIAS_FILE="/etc/scratchpkg.alias"
-
-# default value from pkgbuild
-SOURCE_DIR="/var/cache/scratchpkg/sources"
-PACKAGE_DIR="/var/cache/scratchpkg/packages"
-COMPRESSION_MODE="xz"
-
 mode=$1
 
 [ "$mode" ] || {
@@ -1203,19 +1405,31 @@ shift
 
 for opt in $@; do
 	case $opt in
-		--nocolor) nocolor;;
-		 --repo=*) PORT_REPO="$PORT_REPO ${opt#*=}";;
-		      --*) MAINOPTS="$MAINOPTS $opt";;
-		       -*) char=${#opt}; count=1
-		           while [ "$count" != "$char" ]; do
-				      count=$((count+1))
-		              MAINOPTS="$MAINOPTS -$(printf '%s' $opt | cut -c $count)"
-				   done;;
-		        *) MAINOPTS="$MAINOPTS $opt";;
+	     --nocolor) nocolor;;
+	      --repo=*) PORT_REPO="$PORT_REPO ${opt#*=}";;
+	 --repo-file=*) REPO_FILE="${opt#*=}";;
+	--alias-file=*) ALIAS_FILE="${opt#*=}";;
+	           --*) MAINOPTS="$MAINOPTS $opt";;
+	            -*) char=${#opt}; count=1
+	                while [ "$count" != "$char" ]; do
+	                   count=$((count+1))
+	                   MAINOPTS="$MAINOPTS -$(printf '%s' $opt | cut -c $count)"
+	                done;;
+	             *) MAINOPTS="$MAINOPTS $opt";;
 	esac
 	shift
 done
 
+BUILD_SCRIPT="spkgbuild"
+INDEX_DIR="/var/lib/scratchpkg/index"
+REPO_FILE="${REPO_FILE:-/etc/scratchpkg.repo}"
+ALIAS_FILE="${ALIAS_FILE:-/etc/scratchpkg.alias}"
+
+# default value from pkgbuild
+SOURCE_DIR="/var/cache/scratchpkg/sources"
+PACKAGE_DIR="/var/cache/scratchpkg/packages"
+COMPRESSION_MODE="xz"
+
 if [ -f "$REPO_FILE" ]; then
 	for repodir in $(grep -Ev '^(#|$)' "$REPO_FILE" | awk '{print $1}'); do
 		PORT_REPO="$PORT_REPO $repodir"

scratchpkg.conf

@@ -9,7 +9,7 @@ MAKEFLAGS="-j$(nproc)"
 # SOURCE_DIR="/var/cache/scratchpkg/sources"
 # PACKAGE_DIR="/var/cache/scratchpkg/packages"
 # WORK_DIR="/var/cache/scratchpkg/work"
-# DOWNLOAD_PROG="wget"
+# DOWNLOAD_PROG="auto"
 # WGET_OPTS=""
 # CURL_OPTS=""
 # COMPRESSION_MODE="xz"

xchroot

@@ -1,4 +1,7 @@
 #!/bin/sh
+#
+# script to enter chroot
+#
 
 printhelp() {
 	cat << EOF
@@ -14,6 +17,13 @@ EOF
 msgerr() {
 	echo "ERROR: $*"
 }
+
+unmount() {
+	while true; do
+		mountpoint -q $1 || break
+		umount $1 2>/dev/null
+	done
+}
 	
 [ "$(id -u)" = "0" ] || {
 	msgerr "$(basename $0) need root access!"
@@ -78,13 +88,13 @@ retval=$?
 	mv $TARGET/etc/resolv.conf.tmp $TARGET/etc/resolv.conf
 }
 
-umount $TARGET/dev/pts
-umount $TARGET/dev
-umount $TARGET/run
-umount $TARGET/proc
+unmount $TARGET/dev/pts
+unmount $TARGET/dev
+unmount $TARGET/run
+unmount $TARGET/proc
 if [ -n "$EFI_SYSTEM" ]; then
-	umount $TARGET/sys/firmware/efi/efivars
+	unmount $TARGET/sys/firmware/efi/efivars
 fi
-umount $TARGET/sys
+unmount $TARGET/sys
 
 exit $retval