From 70d425c1d341e5b3d36e612560f922dbd3b20e63 Mon Sep 17 00:00:00 2001 From: Florian Pritz Date: Fri, 6 Apr 2012 20:51:17 +0200 Subject: pkgdelta: rework option/argument parser Signed-off-by: Florian Pritz Signed-off-by: Dan McGee --- scripts/pkgdelta.sh.in | 45 +++++++++++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 18 deletions(-) (limited to 'scripts/pkgdelta.sh.in') diff --git a/scripts/pkgdelta.sh.in b/scripts/pkgdelta.sh.in index 5fcc5be4..511910ba 100644 --- a/scripts/pkgdelta.sh.in +++ b/scripts/pkgdelta.sh.in @@ -38,11 +38,14 @@ m4_include(library/output_format.sh) # print usage instructions usage() { printf "pkgdelta (pacman) %s\n\n" "$myver" - printf -- "$(gettext "Usage: pkgdelta [-q] \n")" + printf -- "$(gettext "Usage: pkgdelta [options] \n")" printf -- "$(gettext "\ pkgdelta will create a delta file between two packages.\n\ This delta file can then be added to a database using repo-add.\n\n")" printf -- "$(gettext "Example: pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz")\n" + echo + printf -- "$(gettext "Options:\n")" + printf -- " -q ""$(gettext "quiet\n")" } version() { @@ -123,32 +126,38 @@ create_xdelta() return 0 } -case "$1" in - -h|--help) usage; exit 0 ;; - -V|--version) version; exit 0 ;; - -q|--quiet) QUIET=1; shift ;; -esac - -if (( $# != 2 )); then +declare -a args + +# parse arguments +while (( $# )); do + case "$1" in + -h|--help) usage; exit 0 ;; + -V|--version) version; exit 0 ;; + -q|--quiet) QUIET=1;; + --) shift; args+=("$@"); break 2 ;; + -*) echo "invalid option -- '$1'"; usage; exit 1 ;; + *) args+=("$1");; + esac + shift +done + +if (( ${#args[@]} != 2 )); then usage exit 1 fi -if [[ ! -f $1 ]]; then - error "$(gettext "File '%s' does not exist")" "$1" - exit 1 -fi - -if [[ ! -f $2 ]]; then - error "$(gettext "File '%s' does not exist")" "$2" - exit 1 -fi +for i in "${args[@]}"; do + if [[ ! -f $i ]]; then + error "$(gettext "File '%s' does not exist")" "$i" + exit 1 + fi +done if ! type xdelta3 &>/dev/null; then error "$(gettext "Cannot find the xdelta3 binary! Is xdelta3 installed?")" exit 1 fi -create_xdelta "$1" "$2" +create_xdelta "${args[@]}" # vim: set ts=2 sw=2 noet: -- cgit v1.2.3 From 839953f1113c70d13560bfd05c5e52139c7f562f Mon Sep 17 00:00:00 2001 From: Florian Pritz Date: Fri, 6 Apr 2012 23:37:32 +0200 Subject: pkgdelta: implement requirments for delta generation Big deltas or deltas for very small packages are not needed so we should check that and not generate any. Signed-off-by: Florian Pritz Signed-off-by: Dan McGee --- scripts/pkgdelta.sh.in | 52 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 49 insertions(+), 3 deletions(-) (limited to 'scripts/pkgdelta.sh.in') diff --git a/scripts/pkgdelta.sh.in b/scripts/pkgdelta.sh.in index 511910ba..66ee35ec 100644 --- a/scripts/pkgdelta.sh.in +++ b/scripts/pkgdelta.sh.in @@ -30,6 +30,13 @@ myver='@PACKAGE_VERSION@' QUIET=0 +# minimal of package before deltas are generated (bytes) +min_pkg_size=$((1024*1024)) + +# percent of new package above which the delta will be discarded +max_delta_size=70 + + # ensure we have a sane umask set umask 0022 @@ -46,6 +53,8 @@ This delta file can then be added to a database using repo-add.\n\n")" echo printf -- "$(gettext "Options:\n")" printf -- " -q ""$(gettext "quiet\n")" + printf -- " --min-pkg-size ""$(gettext "minimal of package before deltas are generated (bytes)\n")" + printf -- " --max-delta-size ""$(gettext "percent of new package above which the delta will be discarded\n")" } version() { @@ -56,6 +65,10 @@ This is free software; see the source for copying conditions.\n\ There is NO WARRANTY, to the extent permitted by law.\n")" } +isnumeric() { + [[ $1 != *[!0-9]* ]] +} + read_pkginfo() { pkgname= pkgver= arch= @@ -96,6 +109,13 @@ create_xdelta() newver="$pkgver" newarch="$arch" + pkgsize="$(@SIZECMD@ -L "$newfile")" + + if ((pkgsize < min_pkg_size)); then + msg "$(gettext "Skipping delta creation for small package: %s - size %s")" "$newname" "$pkgsize" + return 0 + fi + if [[ $oldname != "$newname" ]]; then error "$(gettext "The package names don't match : '%s' and '%s'")" "$oldname" "$newname" return 1 @@ -119,10 +139,19 @@ create_xdelta() if (( ret )); then error "$(gettext "Delta could not be created.")" return 1 - else - msg "$(gettext "Generated delta : '%s'")" "$deltafile" - (( QUIET )) && echo "$deltafile" fi + + deltasize="$(@SIZECMD@ -L "$deltafile")" + + if ((max_delta_size * pkgsize / 100 < deltasize)); then + msg "$(gettext "Delta package larger than maximum size. Removing.")" + rm -f "$deltafile" + return 0 + fi + + msg "$(gettext "Generated delta : '%s'")" "$deltafile" + (( QUIET )) && echo "$deltafile" + return 0 } @@ -134,6 +163,23 @@ while (( $# )); do -h|--help) usage; exit 0 ;; -V|--version) version; exit 0 ;; -q|--quiet) QUIET=1;; + --min-pkg-size) + if ! isnumeric "$2"; then + echo "invalid argument '$2' for option -- '$1'" + exit 1 + fi + min_pkg_size=$2 + shift + ;; + --max-delta-size) + arg=$(echo "$2" | awk '{print $1 * 100}') + if ! isnumeric "$arg" || (($arg > 200)); then + echo "invalid argument '$2' for option -- '$1'" + exit 1 + fi + max_delta_size=$arg + shift + ;; --) shift; args+=("$@"); break 2 ;; -*) echo "invalid option -- '$1'"; usage; exit 1 ;; *) args+=("$1");; -- cgit v1.2.3 From 133d174e60951dcca39d4c4063a85de75f52f6a8 Mon Sep 17 00:00:00 2001 From: Florian Pritz Date: Sat, 7 Apr 2012 14:18:28 +0200 Subject: pkgdelta/repo-add: quoting fixes This removes some unnecessary quotes and adds quotes in a few places to hopefully work correctly if the tempdir has spaces. Signed-off-by: Florian Pritz Signed-off-by: Dan McGee --- scripts/pkgdelta.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts/pkgdelta.sh.in') diff --git a/scripts/pkgdelta.sh.in b/scripts/pkgdelta.sh.in index 66ee35ec..41d399b0 100644 --- a/scripts/pkgdelta.sh.in +++ b/scripts/pkgdelta.sh.in @@ -132,7 +132,7 @@ create_xdelta() fi msg "$(gettext "Generating delta from version %s to version %s")" "$oldver" "$newver" - deltafile="$(dirname $newfile)/$pkgname-${oldver}_to_${newver}-$arch.delta" + deltafile=$(dirname "$newfile")/$pkgname-${oldver}_to_${newver}-$arch.delta local ret=0 xdelta3 -q -f -s "$oldfile" "$newfile" "$deltafile" || ret=$? -- cgit v1.2.3