Attachment 302113 Details for Bug 442033 – Add -r option to build-jar-repository

[patch] Add -r option to build-jar-repository

jpackage-utils-1.7.5-relalinks.patch (text/plain), 3.43 KB, created by Lubomir Kundrak on 2008-04-11 12:45:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lubomir Kundrak

Created: 2008-04-11 12:45:58 UTC

Size: 3.43 KB

patch

obsolete

>diff -urp jpackage-utils-1.7.5.orig/bin/build-jar-repository jpackage-utils-1.7.5/bin/build-jar-repository
>--- jpackage-utils-1.7.5.orig/bin/build-jar-repository	2006-09-19 21:55:46.000000000 +0200
>+++ jpackage-utils-1.7.5/bin/build-jar-repository	2008-04-11 14:36:28.000000000 +0200
>@@ -13,10 +13,11 @@
> # Prints help message
> usage() {
> /bin/cat >&2 << EOF_USAGE
>-Usage: $0 [<linktype>] <directory> <jar1> [<jar2> .. <jarn>]
>+Usage: $0 [<option>] <directory> <jar1> [<jar2> .. <jarn>]
> 
> With:
>-    linktype:
>+    option:
>+              -r <dir>                 make links relative to specified root
>               -s, --soft, --symbolic   create symbolic links (default)
>               -h, --hard               create hard links
>               -c, --copy               copy files
>diff -urp jpackage-utils-1.7.5.orig/java-utils/java-functions jpackage-utils-1.7.5/java-utils/java-functions
>--- jpackage-utils-1.7.5.orig/java-utils/java-functions	2008-04-01 19:57:42.000000000 +0200
>+++ jpackage-utils-1.7.5/java-utils/java-functions	2008-04-11 14:34:21.000000000 +0200
>@@ -5,6 +5,7 @@
> #   Ville SkyttÃ¤ <scop at jpackage.org>
> #   David Walluck <david@jpackage.org>
> #   Nicolas Mailhot <Nicolas.Mailhot at laPoste.net>
>+#   Lubomir Kundrak <lkundrak@redhat.com>
> 
> # Allow user to override JAVA_HOME
> # in his environment
>@@ -183,6 +184,10 @@ link_jar_repository() {
> 
>    while [ $# -gt 0 ] ; do
>       case "$1" in
>+         -r|--root)
>+            shift
>+            _ROOT=$1/
>+            ;;
>          -h|--hard)
>             _LINK_CMD="/bin/ln -f"
>             ;;
>@@ -202,10 +207,15 @@ link_jar_repository() {
>          *)
>             if [ -z "$repository" ] ; then
>                repository=$1
>-               if ! [ -d "$repository" -a -w "$repository" ] ; then
>+               if ! [ -d "$_ROOT$repository" -a -w "$_ROOT$repository" ] ; then
>                   echo "$0: error: $1 must be a writable directory" >&2
>                   exit 1
>                fi
>+               # If root was specified, define prefix for relative links
>+               if [ ! -z "$_ROOT" ]
>+               then
>+                  rel_root=$(echo $repository |sed 's,^/,,;s,/$,,;s,[^/]*,..,g')
>+               fi
>             else
>                extension_list="$extension_list $1"
>             fi
>@@ -217,7 +227,7 @@ link_jar_repository() {
>    [ -z "$_LINK_CMD" ] && _LINK_CMD="/bin/ln -fs"
>    extension_list="$extension_list $@"
> 
>-   pushd $repository > /dev/null
>+   pushd $_ROOT$repository > /dev/null
>       _ALLFOUND=0
>       for extension in $extension_list ; do
>          extension=$(echo $extension | sed 's+/$++g' | sed 's+\.jar$++g')
>@@ -234,7 +244,7 @@ link_jar_repository() {
>                done
>             else
>                /bin/rm -fr $extension.jar
>-               $_LINK_CMD $found_extension $extension.jar
>+               $_LINK_CMD $rel_root$found_extension $extension.jar
>             fi
>          else
>             # Defer failure to get list of all errors in one shot
>diff -urp jpackage-utils-1.7.5.orig/man/build-jar-repository.1 jpackage-utils-1.7.5/man/build-jar-repository.1
>--- jpackage-utils-1.7.5.orig/man/build-jar-repository.1	2006-02-28 16:22:44.000000000 +0100
>+++ jpackage-utils-1.7.5/man/build-jar-repository.1	2008-04-11 14:37:43.000000000 +0200
>@@ -11,6 +11,8 @@ symbolic links
> .PP
> If no option is specified the default action will be to create symbolic links
> .TP
>+\fB\-r\fR \fIROOT\fR
>+make links relative to specified root
> \fB\-c\fR, \fB\-\-copy\fR
> copy files
> .TP

Actions: View | Diff

Attachments on bug 442033: 302113