From cf9e2ef8c1a34dea97df6bd2e03f6f12b3c4a253 Mon Sep 17 00:00:00 2001
From: Jephte Clain <Jephte.Clain@univ-reunion.fr>
Date: Tue, 25 Sep 2018 14:24:29 +0400
Subject: [PATCH] =?UTF-8?q?mettre=20les=20scripts=20dans=20le=20r=C3=A9per?=
 =?UTF-8?q?toire=20bin/?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/nulib/{ => bin}/bshell            | 4 ++--
 lib/nulib/{ => bin}/ddb-query_rtoinst | 0
 lib/nulib/{ => bin}/ddb-query_rwoinst | 0
 lib/nulib/{ => bin}/ddb-query_rwyinst | 0
 lib/nulib/{ => bin}/ddb-query_xuinst  | 0
 lib/nulib/{ => bin}/ddb-save_objects  | 0
 lib/nulib/{ => bin}/deploydb          | 4 ++--
 lib/nulib/{ => bin}/deploydb.conf     | 0
 lib/nulib/{ => bin}/pshell            | 5 ++---
 lib/nulib/{ => bin}/pshell.py         | 0
 lib/nulib/{ => bin}/update-docs       | 4 ++--
 11 files changed, 8 insertions(+), 9 deletions(-)
 rename lib/nulib/{ => bin}/bshell (91%)
 rename lib/nulib/{ => bin}/ddb-query_rtoinst (100%)
 rename lib/nulib/{ => bin}/ddb-query_rwoinst (100%)
 rename lib/nulib/{ => bin}/ddb-query_rwyinst (100%)
 rename lib/nulib/{ => bin}/ddb-query_xuinst (100%)
 rename lib/nulib/{ => bin}/ddb-save_objects (100%)
 rename lib/nulib/{ => bin}/deploydb (69%)
 rename lib/nulib/{ => bin}/deploydb.conf (100%)
 rename lib/nulib/{ => bin}/pshell (66%)
 rename lib/nulib/{ => bin}/pshell.py (100%)
 rename lib/nulib/{ => bin}/update-docs (96%)

diff --git a/lib/nulib/bshell b/lib/nulib/bin/bshell
similarity index 91%
rename from lib/nulib/bshell
rename to lib/nulib/bin/bshell
index 9d4e2e2..2eb8733 100755
--- a/lib/nulib/bshell
+++ b/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
diff --git a/lib/nulib/ddb-query_rtoinst b/lib/nulib/bin/ddb-query_rtoinst
similarity index 100%
rename from lib/nulib/ddb-query_rtoinst
rename to lib/nulib/bin/ddb-query_rtoinst
diff --git a/lib/nulib/ddb-query_rwoinst b/lib/nulib/bin/ddb-query_rwoinst
similarity index 100%
rename from lib/nulib/ddb-query_rwoinst
rename to lib/nulib/bin/ddb-query_rwoinst
diff --git a/lib/nulib/ddb-query_rwyinst b/lib/nulib/bin/ddb-query_rwyinst
similarity index 100%
rename from lib/nulib/ddb-query_rwyinst
rename to lib/nulib/bin/ddb-query_rwyinst
diff --git a/lib/nulib/ddb-query_xuinst b/lib/nulib/bin/ddb-query_xuinst
similarity index 100%
rename from lib/nulib/ddb-query_xuinst
rename to lib/nulib/bin/ddb-query_xuinst
diff --git a/lib/nulib/ddb-save_objects b/lib/nulib/bin/ddb-save_objects
similarity index 100%
rename from lib/nulib/ddb-save_objects
rename to lib/nulib/bin/ddb-save_objects
diff --git a/lib/nulib/deploydb b/lib/nulib/bin/deploydb
similarity index 69%
rename from lib/nulib/deploydb
rename to lib/nulib/bin/deploydb
index 9b9976b..5ca1a41 100755
--- a/lib/nulib/deploydb
+++ b/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
 
diff --git a/lib/nulib/deploydb.conf b/lib/nulib/bin/deploydb.conf
similarity index 100%
rename from lib/nulib/deploydb.conf
rename to lib/nulib/bin/deploydb.conf
diff --git a/lib/nulib/pshell b/lib/nulib/bin/pshell
similarity index 66%
rename from lib/nulib/pshell
rename to lib/nulib/bin/pshell
index 36d7b49..a37f3ab 100755
--- a/lib/nulib/pshell
+++ b/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")"
diff --git a/lib/nulib/pshell.py b/lib/nulib/bin/pshell.py
similarity index 100%
rename from lib/nulib/pshell.py
rename to lib/nulib/bin/pshell.py
diff --git a/lib/nulib/update-docs b/lib/nulib/bin/update-docs
similarity index 96%
rename from lib/nulib/update-docs
rename to lib/nulib/bin/update-docs
index 0a4a9fa..bd4bd38 100755
--- a/lib/nulib/update-docs
+++ b/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=()