mettre les scripts dans le répertoire bin/

lib/nulib/bin/bshell

@@ -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")/load.sh" || exit 1
+source "$(dirname -- "$0")/../load.sh" || exit 1
 export NULIBDIR NULIBINIT
 
 ac_set_tmpfile bashrc
@@ -25,7 +25,7 @@ else
   fi
   PS1=\"[nulib-shell] \$PS1\"
 fi
-$(qvals source "$MYDIR/load.sh")"
+$(qvals source "$MYDIR/../load.sh")"
 
 "$SHELL" --rcfile "$bashrc" -i -- "$@"
 # note: ne pas faire exec "$SHELL", parce que sinon le fichier temporaire bashrc

lib/nulib/bin/deploydb

@@ -4,8 +4,8 @@ MYNAME="$(basename -- "$0")"
 : "${PYTHON_MAIN_MODULE:=$MYNAME}"
 
 MYDIR="$(dirname -- "$0")"
-if [ -n "$PYTHONPATH" ]; then PYTHONPATH="$MYDIR/python:$PYTHONPATH"
-else PYTHONPATH="$MYDIR/python"
+if [ -n "$PYTHONPATH" ]; then PYTHONPATH="$MYDIR/../python:$PYTHONPATH"
+else PYTHONPATH="$MYDIR/../python"
 fi
 export PYTHONPATH
 

lib/nulib/bin/pshell

@@ -1,13 +1,12 @@
 #!/bin/bash
 # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8
-scriptdir="$(dirname -- "$0")"
 if [ -z "$NULIBDIR" -o "$NULIBDIR" != "$NULIBINIT" ]; then
     # charger nulib si ce n'est pas déjà le cas
-    source "$scriptdir/load.sh"
+    source "$(dirname -- "$0")/../load.sh"
 fi
 
 DEFAULT_PYTHON=python2.7
 
 #
 echo ">>> Shell Python pour nulib"
-exec "${PYTHON:-$DEFAULT_PYTHON}" -i -c "$(<"$scriptdir/pshell.py")"
+exec "${PYTHON:-$DEFAULT_PYTHON}" -i -c "$(<"$MYDIR/pshell.py")"

lib/nulib/bin/update-docs

@@ -2,9 +2,9 @@
 # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8
 NULIB_NO_IMPORT_DEFAULTS=1
 MYDIR="$(dirname -- "$0")"
-source "$MYDIR/load.sh" || exit 1
+source "$MYDIR/../load.sh" || exit 1
 
-NULIB_DOCDIR="$MYDIR/doc/bash"
+NULIB_DOCDIR="$MYDIR/../doc/bash"
 mkdir -p "$NULIB_DOCDIR"
 
 NULIB_DOCUMENTED_MODULES=()