maj des chemins

lib/templates/auto

@@ -23,10 +23,9 @@ if [ $# -eq 2 ]; then
     fi
 fi
 
-#source /etc/ulib &&
-source "$(dirname "$0")/../../ulib/ulib" &&
-urequire DEFAULTS ||
-exit 1
+#source /etc/ulib || exit 1
+source "$(dirname "$0")/../../ulib/ulib" || exit 1
+urequire DEFAULTS
 
 [ $# -eq 1 -a "$1" == "--help" ] && exit_with display_help
 

lib/templates/java

@@ -46,10 +46,9 @@ if [ $# -eq 2 ]; then
     fi
 fi
 
-#source /etc/ulib &&
-source "$(dirname "$0")/../../ulib/ulib" &&
-urequire DEFAULTS ||
-exit 1
+#source /etc/ulib || exit 1
+source "$(dirname "$0")/../../lib/ulib/ulib" || exit 1
+urequire DEFAULTS
 
 function check_overwrite() {
     if [ -e "$1" -a -z "$overwrite" ]; then

lib/templates/puppet

@@ -46,10 +46,9 @@ if [ $# -eq 2 ]; then
     fi
 fi
 
-#source /etc/ulib &&
-source "$(dirname "$0")/../../ulib/ulib" &&
-urequire DEFAULTS ||
-exit 1
+#source /etc/ulib || exit 1
+source "$(dirname "$0")/../../lib/ulib/ulib" || exit 1
+urequire DEFAULTS
 
 function check_overwrite() {
     if [ -e "$1" -a -z "$overwrite" ]; then

lib/templates/script.template

@@ -49,10 +49,9 @@ if [ $# -eq 2 ]; then
     fi
 fi
 
-#source /etc/ulib &&
-source "$(dirname "$0")/../../ulib/ulib" &&
-urequire DEFAULTS ||
-exit 1
+#source /etc/ulib || exit 1
+source "$(dirname "$0")/../../lib/ulib/ulib" || exit 1
+urequire DEFAULTS
 
 function check_overwrite() {
     if [ -e "$1" -a -z "$overwrite" ]; then

lib/templates/shell

@@ -53,7 +53,7 @@ if [ $# -eq 2 ]; then
 fi
 
 #source /etc/ulib || exit 1
-source "$(dirname "$0")/../../ulib/ulib" || exit 1
+source "$(dirname "$0")/../../lib/ulib/ulib" || exit 1
 urequire DEFAULTS
 
 set_defaults nutools

lib/templates/text

@@ -46,10 +46,9 @@ if [ $# -eq 2 ]; then
     fi
 fi
 
-#source /etc/ulib &&
-source "$(dirname "$0")/../../ulib/ulib" &&
-urequire DEFAULTS ||
-exit 1
+#source /etc/ulib || exit 1
+source "$(dirname "$0")/../../lib/ulib/ulib" || exit 1
+urequire DEFAULTS
 
 function check_overwrite() {
     if [ -e "$1" -a -z "$overwrite" ]; then

lib/templates/www

@@ -46,10 +46,9 @@ if [ $# -eq 2 ]; then
     fi
 fi
 
-#source /etc/ulib &&
-source "$(dirname "$0")/../../ulib/ulib" &&
-urequire DEFAULTS ||
-exit 1
+#source /etc/ulib || exit 1
+source "$(dirname "$0")/../../lib/ulib/ulib" || exit 1
+urequire DEFAULTS
 
 function check_overwrite() {
     if [ -e "$1" -a -z "$overwrite" ]; then