From 52a3b381a515ee12d46e5a227e732386fbc5dce6 Mon Sep 17 00:00:00 2001
From: Jephte CLAIN <Jephte.Clain@univ-reunion.fr>
Date: Tue, 8 Jul 2014 11:03:07 +0400
Subject: [PATCH] maj des chemins

---
 lib/local-uinst               |  5 +++++
 lib/local-uinst.sh            |  7 +++++++
 lib/templates/auto            |  2 +-
 lib/templates/java            |  2 +-
 lib/templates/puppet          |  2 +-
 lib/templates/script.template |  2 +-
 lib/templates/shell           |  2 +-
 lib/templates/text            |  2 +-
 lib/templates/www             |  2 +-
 ulib                          | 14 +++++++++++---
 10 files changed, 30 insertions(+), 10 deletions(-)
 create mode 100755 lib/local-uinst
 create mode 100755 lib/local-uinst.sh

diff --git a/lib/local-uinst b/lib/local-uinst
new file mode 100755
index 0000000..5cce5a9
--- /dev/null
+++ b/lib/local-uinst
@@ -0,0 +1,5 @@
+#!/bin/bash
+# -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8
+source "$(dirname "$0")/ulib/ulib" || exit 1
+urequire DEFAULTS uinst
+uinst_nolocal "$@"
diff --git a/lib/local-uinst.sh b/lib/local-uinst.sh
new file mode 100755
index 0000000..075dee0
--- /dev/null
+++ b/lib/local-uinst.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+# -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8
+# Version de uinst qui fonctionne avec /bin/sh. Le contrôle est transmis à
+# bash, qui est recherché dans une liste de répertoires standards
+. `dirname "$0"`/ulib/ulibsh || exit 1
+urequire DEFAULTS uinst
+uinst_nolocal "$@"
diff --git a/lib/templates/auto b/lib/templates/auto
index ad46d84..3b0fc73 100755
--- a/lib/templates/auto
+++ b/lib/templates/auto
@@ -24,7 +24,7 @@ if [ $# -eq 2 ]; then
 fi
 
 #source /etc/ulib || exit 1
-source "$(dirname "$0")/../../ulib/ulib" || exit 1
+source "$(dirname "$0")/../ulib/ulib" || exit 1
 urequire DEFAULTS
 
 [ $# -eq 1 -a "$1" == "--help" ] && exit_with display_help
diff --git a/lib/templates/java b/lib/templates/java
index 94437ee..a55e190 100755
--- a/lib/templates/java
+++ b/lib/templates/java
@@ -47,7 +47,7 @@ if [ $# -eq 2 ]; then
 fi
 
 #source /etc/ulib || exit 1
-source "$(dirname "$0")/../../lib/ulib/ulib" || exit 1
+source "$(dirname "$0")/../ulib/ulib" || exit 1
 urequire DEFAULTS
 
 function check_overwrite() {
diff --git a/lib/templates/puppet b/lib/templates/puppet
index 60f8229..0cce73a 100755
--- a/lib/templates/puppet
+++ b/lib/templates/puppet
@@ -47,7 +47,7 @@ if [ $# -eq 2 ]; then
 fi
 
 #source /etc/ulib || exit 1
-source "$(dirname "$0")/../../lib/ulib/ulib" || exit 1
+source "$(dirname "$0")/../ulib/ulib" || exit 1
 urequire DEFAULTS
 
 function check_overwrite() {
diff --git a/lib/templates/script.template b/lib/templates/script.template
index aee03bf..f73fe19 100644
--- a/lib/templates/script.template
+++ b/lib/templates/script.template
@@ -50,7 +50,7 @@ if [ $# -eq 2 ]; then
 fi
 
 #source /etc/ulib || exit 1
-source "$(dirname "$0")/../../lib/ulib/ulib" || exit 1
+source "$(dirname "$0")/../ulib/ulib" || exit 1
 urequire DEFAULTS
 
 function check_overwrite() {
diff --git a/lib/templates/shell b/lib/templates/shell
index 90ab59a..79ea20a 100755
--- a/lib/templates/shell
+++ b/lib/templates/shell
@@ -53,7 +53,7 @@ if [ $# -eq 2 ]; then
 fi
 
 #source /etc/ulib || exit 1
-source "$(dirname "$0")/../../lib/ulib/ulib" || exit 1
+source "$(dirname "$0")/../ulib/ulib" || exit 1
 urequire DEFAULTS
 
 set_defaults nutools
diff --git a/lib/templates/text b/lib/templates/text
index 3ececcb..0343c6f 100755
--- a/lib/templates/text
+++ b/lib/templates/text
@@ -47,7 +47,7 @@ if [ $# -eq 2 ]; then
 fi
 
 #source /etc/ulib || exit 1
-source "$(dirname "$0")/../../lib/ulib/ulib" || exit 1
+source "$(dirname "$0")/../ulib/ulib" || exit 1
 urequire DEFAULTS
 
 function check_overwrite() {
diff --git a/lib/templates/www b/lib/templates/www
index b2bd693..259d102 100755
--- a/lib/templates/www
+++ b/lib/templates/www
@@ -47,7 +47,7 @@ if [ $# -eq 2 ]; then
 fi
 
 #source /etc/ulib || exit 1
-source "$(dirname "$0")/../../lib/ulib/ulib" || exit 1
+source "$(dirname "$0")/../ulib/ulib" || exit 1
 urequire DEFAULTS
 
 function check_overwrite() {
diff --git a/ulib b/ulib
index fa75f76..8bde8d2 100755
--- a/ulib
+++ b/ulib
@@ -184,7 +184,9 @@ sync)
         #syncsupport=
     }
 
-    [ -n "$destdir" ] || destdir="${1:-.}"
+    [ -n "$destdir" ] || destdir="$1"
+    [ -n "$destdir" ] || { [ -d lib ] && destdir=lib || destdir=.; }
+
     ask_yesno "Voulez-vous copier ${synculib:+
 - la librairie ulib}${syncpyulib:+
 - la librairie pyulib}${syncsupport:+
@@ -203,8 +205,8 @@ dans $(ppath "$destdir")?" O || die
         pyulibsync "$destdir"
     fi
     if [ -n "$syncsupport" ]; then
+        adestdir="$(abspath "$destdir")"
         for i in .nutools-bootstrap; do
-            adestdir="$(abspath "$destdir")"
             if [ "${adestdir%/lib}" != "$adestdir" ]; then
                 # cas particulier: synchro vers un répertoire lib/
                 # dans ce cas, copier le fichier .nutools-bootstrap dans le
@@ -214,8 +216,14 @@ dans $(ppath "$destdir")?" O || die
                 copy_update "$scriptdir/$i" "$destdir"
             fi
         done
+        # calculer le nom du répertoire de destination, pour nommer les fichiers
+        # local-uinst
+        destpfix="${adestdir%/lib}"
+        destpfix="${destpfix##*/}"
+        destpfix="${destpfix:-local}"
         for i in lib/local-uinst lib/local-uinst.sh; do
-            copy_update "$scriptdir/$i" "$destdir"
+            destname="$destpfix-${i#lib/local-}"
+            copy_update "$scriptdir/$i" "$destdir/$destname"
         done
     fi
     exit 0