X-Git-Url: https://pd.if.org/git/?p=zpackage;a=blobdiff_plain;f=zpm-update;h=e1accc87393faf4acf73923aa0e8d2b9399c6c6f;hp=39c111a2f17f6e7274bac7f298f09834b8e427ea;hb=69491d14441cfc893e18e1c60c13c995b93002c9;hpb=a694aec82a1062a9f6dce92ee62dcce229658f7a

diff --git a/zpm-update b/zpm-update
index 39c111a..e1accc8 100755
--- a/zpm-update
+++ b/zpm-update
@@ -109,7 +109,7 @@ uninstall=0
 
 # TODO option to attempt to resume an ongoing install
 # zpm-install [-SCn] [ -d localdb ] [ -f pkgfile ] [ -R installroot ] pkgstr ...
-while getopts f:d:R:nSCvAObBLUzp opt; do
+while getopts f:d:R:nSCvAObBLUzpl opt; do
 	case $opt in
 		f) pkgfile="$OPTARG" ;;
 		d) localdb="$OPTARG" ;;
@@ -202,6 +202,8 @@ fi
 
 if [ $ignorelibdeps -eq 1 ]; then
 	merge=$(zpm search -iIO $search)
+	# TODO search for libs anyway and put a note for non-installed
+	# library deps
 else
 	merge=$(zpm search -iIO -l $search)
 fi
@@ -237,7 +239,6 @@ for mergepkg in $merge; do
 				nlist="$nlist $pkgid:$zpmfile"
 				continue
 			else
-				echo downloading $zpmfile
 				zpm repo fetch $reponame $pkgid
 				if [ -f "$zpmfile" ]; then
 					nlist="$nlist $pkgid:$zpmfile"
@@ -293,7 +294,7 @@ for mergepkg in $merge; do
 	# TODO check for symlinks?
 	if [ $pkgfile != $ZPMDB ]; then
 		echo merging $pkgfile $pkgid
-		zpm merge -Fuv -f "$pkgfile" $pkgid
+		zpm merge -Fu -f "$pkgfile" $pkgid
 		if [ $? -ne 0 ]; then
 			die "unable to merge $pkgfile"
 		fi
@@ -342,10 +343,11 @@ fi
 
 if [ $verbose -gt 0 ]; then
 	syncopts="${syncopts} -v"
-else
-	# force -v during development
-	syncopts="${syncopts} -v"
 fi
+#else
+	# force -v during development
+	#syncopts="${syncopts} -v"
+#fi
 
 if [ $dryrun -eq 0 ] && [ $backup -eq 1 ]; then
 	true