# -F include file content
# -S don't include script content
-die() {
+warn() {
printf 'zpm-merge:' 1>&2
printf ' %s' "$@" 1>&2
printf '\n' 1>&2
exit 1
}
+die() {
+ warn "$@"
+ exit 1
+}
+
verbose=0
mergefiles=0
mergescripts=1
-target=/var/lib/zpm/local.db
+mergeall=1
+update=0
+remove_older=0
+only_if_newer=0
+one_at_a_time=0
target=${ZPMDB:=/var/lib/zpm/local.db}
+# TODO option to only update if new
+# new is hash is different or build time is later
# TODO option to merge all packages found in pkgfile
-while getopts :f:vd:FSs: opt; do
+while getopts :f:vd:FSs:auonO opt; do
case $opt in
f) pkgfile="$OPTARG" ;;
- v) verbose=1 ;;
+ v) verbose=$(( verbose + 1 )) ;;
d) target="$OPTARG" ;;
F) mergefiles=1 ;;
S) mergescripts=0 ;;
s) newstatus="$OPTARG" ;;
+ a) mergeall=1 ;;
+ u) update=1 ;;
+ o) remove_older=1 ;;
+ n) only_if_newer=1 ;;
+ O) one_at_a_time=1 ;;
*) echo 'zpm-merge unknown option' $OPTARG; exit 1 ;;
esac
done
zpm test -v "$target" || exit 1
+if [ $# -eq 0 ]; then
+ mergeall=1
+else
+ mergeall=0
+fi
+
# TODO if pkgfile is specified, allow multiple packages as args
-pkgid=$1
-shift
+if [ $mergeall -eq 0 ]; then
+ pkgid=$1
+ shift
-if [ -z "$pkgid" ]; then
- die "must specify pkgid"
-fi
+ if [ -z "$pkgid" ]; then
+ die "must specify pkgid"
+ fi
-eval "$(zpm parse -E $pkgid)"
+ eval "$(zpm parse -E $pkgid)"
-if [ -z "$pkgfile" ]; then
- pkgfile=$ZPM_PACKAGE_FILE
-fi
+ if [ -z "$pkgfile" ]; then
+ pkgfile=$ZPM_PACKAGE_FILE
+ fi
-# calculate package id, pkgfile, etc
-# cases R = full package id, F = specified package file
+ # calculate package id, pkgfile, etc
+ # cases R = full package id, F = specified package file
-# immediate error
-# --- 000 error, must specify something
-if [ -z "$release" ] && [ -z "$pkgfile" ]; then
- die must specify package file or complete package id
-fi
+ # immediate error
+ # --- 000 error, must specify something
+ if [ -z "$release" ] && [ -z "$pkgfile" ]; then
+ die must specify package file or complete package id
+ fi
-# try to get from package file
-if [ -z "$release" ]; then
- pkgid=$(zpm findpkg -f $pkgfile $pkgid)
- if [ -z "$pkgid" ]; then
- die cannot find package id
+ # try to get from package file
+ if [ -z "$release" ]; then
+ pkgid=$(zpm findpkg -f $pkgfile $pkgid)
+ if [ -z "$pkgid" ]; then
+ die cannot find package id
+ fi
+ eval "$(zpm parse -E $pkgid)"
fi
- eval "$(zpm parse -E $pkgid)"
-fi
-# --F 001 error, wouldn't know which pkgid to create, could derive from file?
-if [ -z "$release" ]; then
- die must specify complete package id
-fi
+ # --F 001 error, wouldn't know which pkgid to create, could derive from file?
+ if [ -z "$release" ]; then
+ die must specify complete package id
+ fi
-# set file from pkgid
-# -R- 010 set file from pkgid, create in file, error if no file
-if [ -z "$pkgfile" ]; then
- pkgfile="$pkgid.zpm"
-fi
+ # set file from pkgid
+ # -R- 010 set file from pkgid, create in file, error if no file
+ if [ -z "$pkgfile" ]; then
+ pkgfile="$pkgid.zpm"
+ fi
-if [ $verbose -gt 0 ]; then
- echo merging $pkgfile $pkgid into $target
+ if [ $verbose -gt 1 ]; then
+ echo merging $pkgfile $pkgid into $target
+ fi
+ pkglist=$pkgid
+else
+ pkglist=$(zpm list -f "$pkgfile")
fi
zpm test -v "$pkgfile" || exit 1
-merged=$(zpm shell "$target" "select 1 from packages_pkgid where pkgid = '$pkgid'")
-if [ -n "$merged" ]; then
- die "$pkgid already exists in $target";
+if [ -n "$newstatus" ]; then
+ newstatus=$(zpm quote "$newstatus")
fi
+mergeone() {
+ pkgid=$1
+ package=$(zpm parse -n "$pkgid")
+ where="where printf('%s-%s-%s', P.package, P.version, P.release) = '$pkgid'"
+ if [ $update -eq 1 ]; then
+ printf "delete from packages_pkgid where pkgid = '%s';\n" "$pkgid"
+ fi
+ if [ $remove_older -eq 1 ]; then
+ printf "delete from packages_pkgid where package = '$package' and pkgid < '%s' collate vercmp;\n" "$pkgid"
+ fi
+ printf "insert or rollback into packages select * from remote.packages P %s;\n" "$where"
+ printf "insert or rollback into packagefiles select * from remote.packagefiles P %s;\n" "$where"
+ printf "insert or rollback into scripts select * from remote.scripts P %s;\n" "$where"
+ if [ $mergefiles -eq 1 ]; then
+ printf "insert into files select F.* from remote.files F\n"
+ printf "inner join remote.packagefiles_pkgid P on P.hash = F.hash %s\n" "$where"
+ printf "on conflict (hash) do nothing;\n";
+ fi
+ # scripts
+ if [ $mergescripts -eq 1 ]; then
+ printf "insert into files select F.* from remote.files F\n"
+ printf "inner join remote.scripts_pkgid P on P.hash = F.hash where P.pkgid = '%s'\n" "$pkgid"
+ printf "on conflict (hash) do nothing;\n";
+ fi
+ if [ -n "$newstatus" ]; then
+ newstatus=$(zpm quote "$newstatus")
+ printf "update packages as P set status = '$newstatus' %s;\n" "$where"
+ fi
+}
+
+check_have() {
+ merged=$(zpm shell "$target" "select 1 from packages_pkgid where pkgid = '$1'")
+ test -n "$merged"
+}
+
+filter_out_have() {
+ mlist=
+ for pkgid in "$@"; do
+ if ! check_have "$pkgid" ; then
+ mlist="$mlist $pkgid"
+ fi
+ done
+ mlist=${mlist#' '}
+ printf '%s' "$mlist"
+}
+
+filter_have() {
+ mlist=
+ for pkgid in "$@"; do
+ if check_have "$pkgid" ; then
+ mlist="$mlist $pkgid"
+ fi
+ done
+ mlist=${mlist#' '}
+ printf '%s' "$mlist"
+}
+
+check_newer() {
+ pkg=$1
+ package=$(zpm parse -n "$pkg")
+ newer=$(zpm shell "$target" "select '$pkg' > (select max(pkgid collate vercmp) from packages_pkgid where package = '$package') collate vercmp")
+ if [ "$newer" = '1' ] || [ -z "$newer" ]; then
+ return 0
+ fi
+ return 1
+}
+
+filter_newer() {
+ mlist=
+ for pkgid in "$@"; do
+ if check_newer "$pkgid" ; then
+ mlist="$mlist $pkgid"
+ fi
+ done
+ mlist=${mlist#' '}
+ printf '%s' "$mlist"
+}
+
+merge_list() {
# TODO file tags and package tags
-{
-cat <<EOS
-.bail on
-attach '$pkgfile' as remote;
-
-begin;
-
-insert or rollback into packages
-select * from remote.packages P
-where
-printf('%s-%s-%s', P.package, P.version, P.release) = '$pkgid'
-;
-
-insert or rollback into packagefiles
-select * from remote.packagefiles PF
-where
-printf('%s-%s-%s', PF.package, PF.version, PF.release) = '$pkgid'
-;
-
-insert or rollback into scripts
-select * from remote.scripts PF
-where
-printf('%s-%s-%s', PF.package, PF.version, PF.release) = '$pkgid'
-;
-EOS
-
-# actual files
-if [ $mergefiles -eq 1 ]; then
-cat<<EOS
-insert into files
-select F.* from remote.files F
-inner join remote.packagefiles_pkgid PF
-on PF.hash = F.hash
-where
-PF.pkgid = '$pkgid'
-on conflict (hash) do nothing
-;
-
-EOS
-fi
+(
+ printf ".bail on\n"
+ printf "attach '%s' as remote;\n" "$pkgfile"
+ printf "begin;\n"
+
+ for pkgid in "$@"; do
+ mergeone "$pkgid"
+ done
+
+ printf "insert or ignore into elfneeded select * from remote.elfneeded;\n"
+ printf "insert or ignore into elflibraries select * from remote.elflibraries;\n"
-# scripts
-if [ $mergescripts -eq 1 ]; then
-cat<<EOS
-insert into files
-select F.* from remote.files F
-inner join remote.scripts_pkgid PF
-on PF.hash = F.hash
-where
-PF.pkgid = '$pkgid'
-on conflict (hash) do nothing
-;
-EOS
+ printf "commit;\n"
+) | zpm shell $target
+}
+
+# check for already merged packages
+if [ $update -eq 0 ] && [ $only_if_newer -eq 0 ]; then
+ have=$(filter_have $pkglist)
+ if [ -n "$have" ]; then
+ die "already merged: $have"
+ fi
fi
-package=$(zpm quote "$name")
-version=$(zpm quote "$version")
+if [ $update -eq 0 ]; then
+ pkglist=$(filter_out_have $pkglist)
+fi
-if [ -n "$newstatus" ]; then
- newstatus=$(zpm quote "$newstatus")
-cat <<EOS
-update packages set status = '$newstatus'
-where package = '$package' and version = '$version' and release = '$release'
-;
-EOS
+if [ $only_if_newer -eq 1 ]; then
+ pkglist=$(filter_newer $pkglist)
+ if [ -z "$pkglist" ]; then
+ exit 0
+ fi
fi
-# elf info
-cat <<EOS
-insert or ignore into elfneeded
-select * from remote.elfneeded
---on conflict (file, needed) do nothing
-;
-insert or ignore into elflibraries
-select * from remote.elflibraries
---on conflict (file, soname) do nothing
-;
-EOS
-
-
-# TODO check for adding file contents
-echo 'commit;'
-} | zpm shell $target
+if [ $one_at_a_time -eq 1 ]; then
+ for pkgid in $pkglist; do
+ if [ $verbose -ne 0 ]; then
+ printf '%s\n' $pkgid
+ fi
+ merge_list $pkgid
+ done
+else
+ if [ $verbose -ne 0 ]; then
+ printf "%s\n" $pkglist
+ fi
+ merge_list $pkglist
+fi
projects / zpackage / blobdiff