From 5e33a36bcd87420ae504103f56aebaf62a2bc979 Mon Sep 17 00:00:00 2001 From: Jephte Clain Date: Wed, 25 Jan 2023 17:14:03 +0400 Subject: [PATCH] =?UTF-8?q?rendre=20coh=C3=A9rent=20les=20en-t=C3=AAtes=20?= =?UTF-8?q?des=20scripts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- EnsureVM | 4 ++-- SKvm | 4 ++-- SVirtualBox | 3 +-- _root | 2 +- apacheconfig | 4 ++-- authftp | 3 +-- caturl | 3 +-- create-user | 3 +-- cssh | 3 +-- cx-conndev | 3 +-- cx-shelldev | 3 +-- cx-updatedev | 3 +-- dk | 2 +- dkbuild | 4 ++-- dmcerts | 2 +- dmctl | 2 +- doinplace | 2 +- dumpclients | 3 +-- ensure-vip | 4 ++-- fconv | 3 +-- fnconv | 3 +-- fndate | 3 +-- foreach | 3 +-- geturl | 3 +-- mkRewriteRules | 4 ++-- mkiso | 3 +-- mkurl | 3 +-- mkusfx | 3 +-- mocifs | 3 +-- modav | 3 +-- moiso | 3 +-- mossh | 3 +-- mssh | 4 ++-- mysqlcsv | 3 +-- mysqlloadcsv | 4 ++-- netconfig | 4 ++-- nutools | 3 +-- openurl | 3 +-- pdev | 4 ++-- pff | 4 ++-- prel | 4 ++-- pver | 4 ++-- pz | 4 ++-- repoctl | 4 ++-- rruns | 4 ++-- rtoinst | 4 ++-- ruinst | 4 ++-- runs | 4 ++-- runsconfig | 4 ++-- runsmod | 4 ++-- rwoinst | 4 ++-- rwyinst | 3 +-- sqlmig | 4 ++-- toinst | 4 ++-- twsync | 4 ++-- uawk | 4 ++-- ubackup | 3 +-- ucalc | 3 +-- uconf | 4 ++-- ucrontab | 2 +- udir | 4 ++-- udist | 4 ++-- uenv | 4 ++-- ufile | 4 ++-- ufixmod | 3 +-- ugenpass | 4 ++-- uinc | 2 +- uinc.sh | 2 +- uinst | 4 ++-- ujava | 4 ++-- uldap | 4 ++-- ulib | 3 +-- ulink | 3 +-- umatch | 3 +-- umirror | 3 +-- umountr | 3 +-- uprefix | 4 ++-- uproject | 4 ++-- uscrontab | 4 ++-- ussh | 3 +-- usysinfos | 3 +-- utempl | 3 +-- utrigger | 2 +- uwatch | 3 +-- vzusage | 3 +-- woArchive | 3 +-- woSwitch | 3 +-- woclean-logs | 3 +-- woctl | 3 +-- woinst | 4 ++-- wosign | 4 ++-- wyinst | 2 +- 92 files changed, 132 insertions(+), 174 deletions(-) diff --git a/EnsureVM b/EnsureVM index 7789701..f678564 100755 --- a/EnsureVM +++ b/EnsureVM @@ -1,7 +1,7 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS service +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 +urequire service function display_help() { uecho "$scriptname: s'assurer que les services sont lancés pour un type de virtualisation diff --git a/SKvm b/SKvm index cb88d5f..53f6b70 100755 --- a/SKvm +++ b/SKvm @@ -1,7 +1,7 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS virsh +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 +urequire virsh function display_help() { uecho "$scriptname: lancer une machine virtuelle kvm diff --git a/SVirtualBox b/SVirtualBox index 252f09d..f65f48b 100755 --- a/SVirtualBox +++ b/SVirtualBox @@ -1,7 +1,6 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 function display_help() { uecho "$scriptname: lancer une machine virtuelle VirtualBox diff --git a/_root b/_root index 088a355..a586f05 100755 --- a/_root +++ b/_root @@ -1,6 +1,6 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 +source "$(dirname -- "$0")/lib/ulib/ulib" || exit 1 urequire base function display_help() { diff --git a/apacheconfig b/apacheconfig index 09d903d..d26c380 100755 --- a/apacheconfig +++ b/apacheconfig @@ -1,7 +1,7 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS template apache.tools +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 +urequire template apache.tools apacheconfig_initvars function display_help() { diff --git a/authftp b/authftp index ad788b8..b35b117 100755 --- a/authftp +++ b/authftp @@ -1,7 +1,6 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 function display_help() { uecho "$scriptname: Se connecter sur un site FTP authentifié diff --git a/caturl b/caturl index 1eb8b7a..b2520db 100755 --- a/caturl +++ b/caturl @@ -1,7 +1,6 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 function display_help() { uecho "$scriptname: Afficher une url diff --git a/create-user b/create-user index 6fdbe69..cfeb8c8 100755 --- a/create-user +++ b/create-user @@ -1,7 +1,6 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 function display_help() { uecho "$scriptname: créer un utilisateur sudoer et lui installer une clé publique ssh diff --git a/cssh b/cssh index 55cc684..222c625 100755 --- a/cssh +++ b/cssh @@ -1,7 +1,6 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 function display_help() { uecho "$scriptname: Faire une connexion ssh en lançant automatiquement un screen sur l'hôte distant diff --git a/cx-conndev b/cx-conndev index ceee40f..42fa232 100755 --- a/cx-conndev +++ b/cx-conndev @@ -1,7 +1,6 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 function display_help() { uecho "$scriptname: se connecter à la base MySQL diff --git a/cx-shelldev b/cx-shelldev index bd97fb5..65b23aa 100755 --- a/cx-shelldev +++ b/cx-shelldev @@ -1,7 +1,6 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 function display_help() { uecho "$scriptname: ouvrir un shell dans le container diff --git a/cx-updatedev b/cx-updatedev index 263ad55..aafd248 100755 --- a/cx-updatedev +++ b/cx-updatedev @@ -1,7 +1,6 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 function display_help() { uecho "$scriptname: mettre à jour un module ur/* ou lib/* sans utiliser composer diff --git a/dk b/dk index c778c40..8ad5602 100755 --- a/dk +++ b/dk @@ -1,6 +1,6 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/auto" || exit 1 +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 urequire pff json function display_help() { diff --git a/dkbuild b/dkbuild index 15aa279..d90b64c 100755 --- a/dkbuild +++ b/dkbuild @@ -1,7 +1,7 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS ptools xmlsupport +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 +urequire ptools xmlsupport SELF="$script" TEMPLATEDIR="$scriptdir/lib/dkbuild/templates" diff --git a/dmcerts b/dmcerts index 0b622f6..865d669 100755 --- a/dmcerts +++ b/dmcerts @@ -1,6 +1,6 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source /etc/ulibauto || exit 1 +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 urequire install function display_help() { diff --git a/dmctl b/dmctl index e178fd2..01521e9 100755 --- a/dmctl +++ b/dmctl @@ -1,6 +1,6 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source /etc/ulibauto || exit 1 +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 function display_help() { uecho "$scriptname: import/exporter une docker-machine diff --git a/doinplace b/doinplace index 4087def..5d0cf8a 100755 --- a/doinplace +++ b/doinplace @@ -11,7 +11,7 @@ if [ "$#" -eq 1 -a "$1" == --nutools-makelinks ]; then exit 0 fi -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 +source "$(dirname -- "$0")/lib/ulib/ulib" || exit 1 urequire base function display_help() { diff --git a/dumpclients b/dumpclients index a28a3f8..d6e9d79 100755 --- a/dumpclients +++ b/dumpclients @@ -1,7 +1,6 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 function display_help() { uecho "$scriptname: afficher les connexions TCP entrantes sur un port diff --git a/ensure-vip b/ensure-vip index 0c9a356..4a07649 100755 --- a/ensure-vip +++ b/ensure-vip @@ -1,7 +1,7 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS ipcalc +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 +urequire ipcalc function display_help() { uecho "$scriptname: s'assurer que l'hôte courant a l'adresse IP spécifiée diff --git a/fconv b/fconv index 4796686..62bb5d5 100755 --- a/fconv +++ b/fconv @@ -1,7 +1,6 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 function display_help() { uecho "$scriptname: convertir un fichier ou les fichiers d'un répertoire diff --git a/fnconv b/fnconv index 6bcaac1..f241254 100755 --- a/fnconv +++ b/fnconv @@ -1,7 +1,6 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 function display_help() { uecho "$scriptname: renommer un fichier ou les fichiers d'un répertoire diff --git a/fndate b/fndate index c87db8a..9424270 100755 --- a/fndate +++ b/fndate @@ -11,8 +11,7 @@ if [ "$#" -eq 1 -a "$1" == --nutools-makelinks ]; then exit 0 fi -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 function display_help() { uecho "$scriptname: manipuler des noms de fichier pour les dater diff --git a/foreach b/foreach index 6f4fc2c..8ab69a8 100755 --- a/foreach +++ b/foreach @@ -1,7 +1,6 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 function display_help() { uecho "$scriptname: lancer une commande pour un ensemble d'arguments diff --git a/geturl b/geturl index ac1fe89..d3c35d8 100755 --- a/geturl +++ b/geturl @@ -1,7 +1,6 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 function display_help() { uecho "$scriptname: Télécharger un fichier avec wget ou curl diff --git a/mkRewriteRules b/mkRewriteRules index 9fcceae..863f1f1 100755 --- a/mkRewriteRules +++ b/mkRewriteRules @@ -1,7 +1,7 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS apache.tools +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 +urequire apache.tools function display_help() { uecho "$scriptname: Créer un fichier de redirections pour Apache à partir d'un certain diff --git a/mkiso b/mkiso index d1dfec5..7e4c185 100755 --- a/mkiso +++ b/mkiso @@ -1,7 +1,6 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 function display_help() { uecho "$scriptname: créer une image iso d'un répertoire diff --git a/mkurl b/mkurl index a9dadbc..564c116 100755 --- a/mkurl +++ b/mkurl @@ -1,7 +1,6 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 function display_help() { uecho "$scriptname: Enregistrer une url dans un fichier raccourci diff --git a/mkusfx b/mkusfx index 3ca0795..8f2606b 100755 --- a/mkusfx +++ b/mkusfx @@ -1,7 +1,6 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 function display_help() { uecho "$scriptname: Créer une archive auto-extractible qui installe son contenu avec uinst diff --git a/mocifs b/mocifs index 7c36126..71b2c9f 100755 --- a/mocifs +++ b/mocifs @@ -1,7 +1,6 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 function display_help() { uecho "$scriptname: Monter un partage Windows/Samba/CIFS diff --git a/modav b/modav index 8860d92..87cabba 100755 --- a/modav +++ b/modav @@ -1,7 +1,6 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 function display_help() { uecho "$scriptname: Monter un répertoire sur un hôte distant avec davfs diff --git a/moiso b/moiso index 1039839..ecbe281 100755 --- a/moiso +++ b/moiso @@ -1,7 +1,6 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 function display_help() { uecho "$scriptname: Monter une image ISO diff --git a/mossh b/mossh index d414566..97e8246 100755 --- a/mossh +++ b/mossh @@ -1,7 +1,6 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 function display_help() { uecho "$scriptname: Monter un répertoire sur un hôte distant avec sshfs diff --git a/mssh b/mssh index a69b3db..97cbf7a 100755 --- a/mssh +++ b/mssh @@ -1,7 +1,7 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/ulib" -urequire DEFAULTS ipcalc +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 +urequire ipcalc if [ $# -eq 1 -a "$1" == "--help" ]; then exit_with uecho "$scriptname: Faire une connexion ssh en utilisant l'exécutable approprié au réseau source et destination diff --git a/mysqlcsv b/mysqlcsv index 095997d..01d9356 100755 --- a/mysqlcsv +++ b/mysqlcsv @@ -1,7 +1,6 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 function display_help() { uecho "$scriptname: Faire une requête MySQL et formater la sortie pour traitement avec awkcsv diff --git a/mysqlloadcsv b/mysqlloadcsv index 6a14fd2..ec8b13d 100755 --- a/mysqlloadcsv +++ b/mysqlloadcsv @@ -1,7 +1,7 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS awk +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 +urequire awk function display_help() { uecho "$scriptname: Charger une table MySQL avec un fichier csv diff --git a/netconfig b/netconfig index 6c4ee0a..c984e32 100755 --- a/netconfig +++ b/netconfig @@ -1,7 +1,7 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS debian +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 +urequire debian function display_help() { uecho "$scriptname: gérer la configuration du réseau diff --git a/nutools b/nutools index a405a72..ac6069f 100755 --- a/nutools +++ b/nutools @@ -1,7 +1,6 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 function display_help() { uecho "$scriptname: configurer ou afficher des informations sur nutools diff --git a/openurl b/openurl index b3fb3c9..ad93023 100755 --- a/openurl +++ b/openurl @@ -1,7 +1,6 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 # faut-il supprimer la sortie erreur? les warnings de GTK sont horripilants. : "${OPENURL_STDERR:=}" diff --git a/pdev b/pdev index cfec8d6..d15c003 100755 --- a/pdev +++ b/pdev @@ -13,8 +13,8 @@ complete -F __pdev_completion pdev exit 0 fi -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS ptools +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 +urequire ptools function display_help() { uecho "$scriptname: basculer sur une branche de développement diff --git a/pff b/pff index dd94ba6..ac3f4d0 100755 --- a/pff +++ b/pff @@ -118,8 +118,8 @@ complete -F __pff_completion -o bashdefault -o default pff exit 0 fi -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS multiconf vcs javaproperties +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 +urequire multiconf vcs javaproperties function display_help() { uecho "$scriptname: gestion de modifications locales diff --git a/prel b/prel index f2ed446..ed7c9fd 100755 --- a/prel +++ b/prel @@ -13,8 +13,8 @@ complete -F __prel_completion prel exit 0 fi -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS ptools +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 +urequire ptools # XXX Ajouter une option pour fusionner les modifications d'une branche de # pré-release dans develop diff --git a/pver b/pver index 8173ff3..32d0c90 100755 --- a/pver +++ b/pver @@ -1,7 +1,7 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS ptools xmlsupport +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 +urequire ptools xmlsupport function pver_display_help() { uecho "$scriptname: gérer des numéros de version selon les règles du versionage sémantique v2.0.0 (http://semver.org/) diff --git a/pz b/pz index c8622d5..0e87284 100755 --- a/pz +++ b/pz @@ -1,7 +1,7 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS vcs ptools +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 +urequire vcs ptools function display_help() { uecho "$scriptname: faire une archive du projet diff --git a/repoctl b/repoctl index 1f9a363..49a4410 100755 --- a/repoctl +++ b/repoctl @@ -1,7 +1,7 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS json +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 +urequire json function display_help() { uecho "$scriptname: piloter un serveur git (gitolite, gogs, gitea, etc.) diff --git a/rruns b/rruns index 94fdb89..a3967b7 100755 --- a/rruns +++ b/rruns @@ -1,7 +1,7 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS runs runsmod +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 +urequire runs runsmod function display_help() { uecho "$scriptname: Déploiement distant avec runs diff --git a/rtoinst b/rtoinst index 423d18c..ca93b8d 100755 --- a/rtoinst +++ b/rtoinst @@ -1,7 +1,7 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS pyulib/pyulib +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 +urequire pyulib/pyulib function display_help() { uecho "$scriptname: Déploiement distant avec toinst diff --git a/ruinst b/ruinst index ee31904..3887dbb 100755 --- a/ruinst +++ b/ruinst @@ -1,7 +1,7 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS pyulib/pyulib +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 +urequire pyulib/pyulib function display_help() { uecho "$scriptname: Déploiement distant avec uinst diff --git a/runs b/runs index 89423ba..a3fd528 100755 --- a/runs +++ b/runs @@ -1,7 +1,7 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS runs runsmod +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 +urequire runs runsmod function display_help() { uecho "$scriptname: Lancer un script avec le protocole runs diff --git a/runsconfig b/runsconfig index fdd80aa..f3daacc 100755 --- a/runsconfig +++ b/runsconfig @@ -1,7 +1,7 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS template runs +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 +urequire template runs function display_help() { uecho "$scriptname: Gérer un répertoire d'hôte de runs diff --git a/runsmod b/runsmod index c0907e7..8d2fd88 100755 --- a/runsmod +++ b/runsmod @@ -1,7 +1,7 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS runsmod +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 +urequire runsmod function display_help() { uecho "$scriptname: récupérer des dépôts git à usage de runs diff --git a/rwoinst b/rwoinst index 3b725a6..79de34b 100755 --- a/rwoinst +++ b/rwoinst @@ -1,7 +1,7 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname -- "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS woinst +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 +urequire woinst function display_help() { uecho "$scriptname: Déploiement distant avec woinst diff --git a/rwyinst b/rwyinst index a0d6789..4c5ee60 100755 --- a/rwyinst +++ b/rwyinst @@ -1,7 +1,6 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname -- "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 function display_help() { uecho "$scriptname: Déploiement distant avec wyinst diff --git a/sqlmig b/sqlmig index 1c97da0..1622d03 100755 --- a/sqlmig +++ b/sqlmig @@ -1,7 +1,7 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname -- "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS install +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 +urequire install function display_help() { uecho "$scriptname: gérer les mises à jour sur une base de données diff --git a/toinst b/toinst index 1cdd1b4..bdc4426 100755 --- a/toinst +++ b/toinst @@ -1,7 +1,7 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS xmlsupport +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 +urequire xmlsupport function display_help() { uecho "$scriptname: Déployer une ou plusieurs webapps vers Tomcat diff --git a/twsync b/twsync index ea4d3bc..9f239d5 100755 --- a/twsync +++ b/twsync @@ -1,7 +1,7 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS udir tiddlywiki javaproperties +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 +urequire udir tiddlywiki javaproperties function display_help() { uecho "$scriptname: synchroniser un répertoire de wiki avec un tiddlywiki diff --git a/uawk b/uawk index 9b6d3ec..1b29de3 100755 --- a/uawk +++ b/uawk @@ -12,8 +12,8 @@ if [ "$#" -eq 1 -a "$1" == --nutools-makelinks ]; then exit 0 fi -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS awk +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 +urequire awk # si on lance le script avec le nom uawk, il faut spécifier l'outil à # utiliser diff --git a/ubackup b/ubackup index 5ef68d3..5e16f74 100755 --- a/ubackup +++ b/ubackup @@ -1,7 +1,6 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 function display_help() { uecho "$scriptname: faire une sauvegarde des fichiers diff --git a/ucalc b/ucalc index aad849f..828056f 100755 --- a/ucalc +++ b/ucalc @@ -1,7 +1,6 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 function display_help() { uecho "$scriptname: Afficher une valeur dans plusieurs unités diff --git a/uconf b/uconf index 01b4d3f..70bcfa2 100755 --- a/uconf +++ b/uconf @@ -1,7 +1,7 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS conf +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 +urequire conf function display_help() { local OENC="$UTF8" diff --git a/ucrontab b/ucrontab index 21f2706..f5edc47 100755 --- a/ucrontab +++ b/ucrontab @@ -1,6 +1,6 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -#source "$(dirname "$0")/lib/ulib/ulib" || exit 1 +#source "$(dirname -- "$0")/lib/ulib/ulib" || exit 1 #urequire DEFAULTS crontab # Pour pouvoir être copié le cas échéant sur un hôte distant, la librairie ulib # est inclue avec uinc à partir de lib/ulib. En mode développement, il faut diff --git a/udir b/udir index 1d41dc7..7ca316c 100755 --- a/udir +++ b/udir @@ -1,7 +1,7 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS udir +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 +urequire udir function display_help() { uecho "$scriptname: gérer les variables de répertoire diff --git a/udist b/udist index 01eae77..46046f1 100755 --- a/udist +++ b/udist @@ -145,8 +145,8 @@ if [ "$#" -eq 1 -a "$1" == --nutools-makelinks ]; then exit 0 fi -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS conf install +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 +urequire conf install INSTALL_VERBOSE= INSTALL_USES_PPATH=1 diff --git a/uenv b/uenv index a61bae1..7129e9a 100755 --- a/uenv +++ b/uenv @@ -1,7 +1,7 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS uenv uenv_update +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 +urequire uenv uenv_update function display_help() { uecho "$scriptname: Mettre à jour la configuration de l'environnement diff --git a/ufile b/ufile index d68ead0..46fc844 100755 --- a/ufile +++ b/ufile @@ -1,7 +1,7 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS multiconf +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 +urequire multiconf function display_help() { uecho "$scriptname: classer des fichiers selon certains règles diff --git a/ufixmod b/ufixmod index 18a386f..6852b6a 100755 --- a/ufixmod +++ b/ufixmod @@ -1,7 +1,6 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 function display_help() { uecho "$scriptname: forcer le mode d'une liste de fichiers diff --git a/ugenpass b/ugenpass index c0e6c79..20d3343 100755 --- a/ugenpass +++ b/ugenpass @@ -1,7 +1,7 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS password +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 +urequire password function display_help() { uecho "$scriptname: générer un mot de passe au hasard diff --git a/uinc b/uinc index 7c088aa..a3d0622 100755 --- a/uinc +++ b/uinc @@ -1,6 +1,6 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 +source "$(dirname -- "$0")/lib/ulib/ulib" || exit 1 urequire uinc export UINCPATH="$ULIBDIR${UINCPATH:+:$UINCPATH}" diff --git a/uinc.sh b/uinc.sh index cce16e4..8c0ef71 100755 --- a/uinc.sh +++ b/uinc.sh @@ -2,7 +2,7 @@ # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 # Version de uinc qui fonctionne avec /bin/sh. Le contrôle est transmis à # bash, qui est recherché dans une liste de répertoires standards -. `dirname "$0"`/lib/ulib/ulibsh || exit 1 +. `dirname -- "$0"`/lib/ulib/ulibsh || exit 1 urequire DEFAULTS uinc export UINCPATH="$ULIBDIR${UINCPATH:+:$UINCPATH}" diff --git a/uinst b/uinst index 733ef64..11a52fb 100755 --- a/uinst +++ b/uinst @@ -1,7 +1,7 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname -- "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS uinst +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 +urequire uinst UINST_STANDALONE=1 uinst_nolocal "$@" diff --git a/ujava b/ujava index 9e5317a..69b1499 100755 --- a/ujava +++ b/ujava @@ -1,7 +1,7 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS java +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 +urequire java function display_help() { uecho "$scriptname: Lancer un script après avoir sélectionné une version de java diff --git a/uldap b/uldap index 6d5cdef..db3936d 100755 --- a/uldap +++ b/uldap @@ -1,7 +1,7 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/ulib" || exit 255 -urequire DEFAULTS ldif prefixes ldap +source "$(dirname -- "$0")/lib/ulib/auto" || exit 255 +urequire ldif prefixes ldap ################################################################################ # Fonctions utilitaire diff --git a/ulib b/ulib index 4e7b311..a6249de 100755 --- a/ulib +++ b/ulib @@ -1,7 +1,6 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 function display_help() { uecho "$scriptname: Gestion des librairies ulib et pyulib diff --git a/ulink b/ulink index 34c797f..03cd6ef 100755 --- a/ulink +++ b/ulink @@ -39,8 +39,7 @@ if [ "$#" -eq 1 -a "$1" == --nutools-makelinks ]; then exit 0 fi -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 # Traduire le nom du script for script_alias in "${SCRIPT_ALIASES[@]}"; do diff --git a/umatch b/umatch index 212971d..b582848 100755 --- a/umatch +++ b/umatch @@ -1,7 +1,6 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 function display_help() { uecho "$scriptname: Afficher le résultat d'une recherche par regexp et compter diff --git a/umirror b/umirror index ecf923f..2b9a2c2 100755 --- a/umirror +++ b/umirror @@ -1,7 +1,6 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 function display_help() { uecho "$scriptname: faire un miroir d'un site web diff --git a/umountr b/umountr index 2c46d8b..ff1ddfa 100755 --- a/umountr +++ b/umountr @@ -1,7 +1,6 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 function display_help() { uecho "$scriptname: démonter un système de fichier récursivement diff --git a/uprefix b/uprefix index b0ef1a9..42d03ca 100755 --- a/uprefix +++ b/uprefix @@ -1,7 +1,7 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS PREFIXES-DEFAULTS +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 +urequire PREFIXES-DEFAULTS function display_help() { uecho "$scriptname: Afficher les préfixes valides pour uinst diff --git a/uproject b/uproject index 046c6ea..f6ccdf7 100755 --- a/uproject +++ b/uproject @@ -203,8 +203,8 @@ if [ "$#" -eq 1 -a "$1" == --nutools-makelinks ]; then exit 0 fi -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS modeline vcs +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 +urequire modeline vcs # Traduire le nom du script for script_alias in "${SCRIPT_ALIASES[@]}"; do diff --git a/uscrontab b/uscrontab index 79310b3..daac27a 100755 --- a/uscrontab +++ b/uscrontab @@ -1,7 +1,7 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS crontab install +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 +urequire crontab install function display_help() { uecho "$scriptname: lancer une suite de commande en respectant une planification de type cron diff --git a/ussh b/ussh index 74abe6f..34d253b 100755 --- a/ussh +++ b/ussh @@ -1,7 +1,6 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 function display_help() { uecho "$scriptname: se connecter par ssh à un ou plusieurs hôtes diff --git a/usysinfos b/usysinfos index e9a36cf..1d2bef4 100755 --- a/usysinfos +++ b/usysinfos @@ -1,7 +1,6 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 function display_help() { uecho "$scriptname: Afficher les informations sur le système diff --git a/utempl b/utempl index 26e460a..4228cc2 100755 --- a/utempl +++ b/utempl @@ -1,7 +1,6 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 function display_help() { uecho "$scriptname: Créer un nouveau fichier à partir d'un modèle diff --git a/utrigger b/utrigger index 490cf60..b18e40c 100755 --- a/utrigger +++ b/utrigger @@ -1,6 +1,6 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 +source "$(dirname -- "$0")/lib/ulib/ulib" || exit 1 urequire base pretty function display_help() { diff --git a/uwatch b/uwatch index e91d8aa..13748e8 100755 --- a/uwatch +++ b/uwatch @@ -1,7 +1,6 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 function display_help() { uecho "$scriptname: afficher l'heure diff --git a/vzusage b/vzusage index dd34c67..3b9a0a2 100755 --- a/vzusage +++ b/vzusage @@ -1,7 +1,6 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 function display_help() { uecho "$scriptname: afficher des informations sur une machine virtuelle OpenVZ diff --git a/woArchive b/woArchive index 8723f97..5e8b9a5 100755 --- a/woArchive +++ b/woArchive @@ -1,7 +1,6 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 function display_help() { uecho "$scriptname: créer une archive de la distribution WebObjects en cours diff --git a/woSwitch b/woSwitch index 6343612..3390cda 100755 --- a/woSwitch +++ b/woSwitch @@ -1,7 +1,6 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 function display_help() { uecho "$scriptname: Changer la version de WebObjects pour le système en cours diff --git a/woclean-logs b/woclean-logs index e40315d..bfcbbbf 100755 --- a/woclean-logs +++ b/woclean-logs @@ -1,7 +1,6 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 function display_help() { uecho "$scriptname: supprimer les fichiers de log inutiles dans /var/log/WebObjects diff --git a/woctl b/woctl index 28d6971..71443ea 100755 --- a/woctl +++ b/woctl @@ -89,8 +89,7 @@ if [ "$#" -eq 1 -a "$1" == --nutools-makelinks ]; then exit 0 fi -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 # Traduire le nom du script for script_alias in "${SCRIPT_ALIASES[@]}"; do diff --git a/woinst b/woinst index 14ec712..2fcef26 100755 --- a/woinst +++ b/woinst @@ -1,6 +1,6 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname -- "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS woinst +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 +urequire woinst woinst "$@" diff --git a/wosign b/wosign index bcb8488..6971c90 100755 --- a/wosign +++ b/wosign @@ -1,7 +1,7 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 -urequire DEFAULTS prefixes apache webobjects java wosign +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 +urequire prefixes apache webobjects java wosign function display_help() { uecho "$scriptname: signer les jars d'un bundle diff --git a/wyinst b/wyinst index c284e90..4fd14c7 100755 --- a/wyinst +++ b/wyinst @@ -1,6 +1,6 @@ #!/bin/bash # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -source "$(dirname "$0")/lib/ulib/ulib" || exit 1 +source "$(dirname -- "$0")/lib/ulib/auto" || exit 1 urequire debian service conf function display_help() {