[gentoo-commits] proj/R_overlay:gsoc13/next commit in: files/shlib/

[gentoo-commits] proj/R_overlay:gsoc13/next commit in: files/shlib/

[André Erdmann]

commit:     b333d613f634a15b59776caa277fec4db577c406
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Sat Jun 22 10:02:23 2013 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Sat Jun 22 10:02:23 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=b333d613

files/shlib/functions.sh:dodir: don't deadlock

Added a missing 'shift' statement.

---
 files/shlib/functions.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/files/shlib/functions.sh b/files/shlib/functions.sh
index d429ff2..5de73d5 100644
--- a/files/shlib/functions.sh
+++ b/files/shlib/functions.sh
@@ -267,6 +267,7 @@ dodir() {
    local fail=0
    while [ $# -gt 0 ]; do
       [ -d "${1}" ] || mkdir -p -- "${1}" || fail=$(( ${fail} + 1 ))
+      shift
    done
    return ${fail}
 }

[gentoo-commits] proj/R_overlay:master commit in: files/shlib/

[André Erdmann]

commit:     b333d613f634a15b59776caa277fec4db577c406
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Sat Jun 22 10:02:23 2013 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Sat Jun 22 10:02:23 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=b333d613

files/shlib/functions.sh:dodir: don't deadlock

Added a missing 'shift' statement.

---
 files/shlib/functions.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/files/shlib/functions.sh b/files/shlib/functions.sh
index d429ff2..5de73d5 100644
--- a/files/shlib/functions.sh
+++ b/files/shlib/functions.sh
@@ -267,6 +267,7 @@ dodir() {
    local fail=0
    while [ $# -gt 0 ]; do
       [ -d "${1}" ] || mkdir -p -- "${1}" || fail=$(( ${fail} + 1 ))
+      shift
    done
    return ${fail}
 }

[gentoo-commits] proj/R_overlay:gsoc13/next commit in: files/shlib/

[André Erdmann]

commit:     f0fafb79fcda9debe74eea42151a378ef972dab9
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Tue Jun 25 21:07:24 2013 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Tue Jun 25 21:07:24 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=f0fafb79

files/shlib/functions.sh: correct typo

---
 files/shlib/functions.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/shlib/functions.sh b/files/shlib/functions.sh
index 5de73d5..05df7fa 100644
--- a/files/shlib/functions.sh
+++ b/files/shlib/functions.sh
@@ -303,7 +303,7 @@ yesno() {
    esac
 }
 
-# ~int str_strim ( *args )
+# ~int str_trim ( *args )
 #
 #  Removes whitespace at the beginning + end of a string
 #  and replaces any whitespace sequence within the string

[gentoo-commits] proj/R_overlay:gsoc13/next commit in: files/shlib/

[André Erdmann]

commit:     411585260d9f58b4b088c4ec816eb417a6c5877b
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Wed Jun 26 17:20:05 2013 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Wed Jun 26 17:20:05 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=41158526

files/shlib/functions.sh: make $SHLIB PATH-like

$SHLIB is now a colon-separated list of directories where function files could
be found.

---
 files/shlib/functions.sh | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/files/shlib/functions.sh b/files/shlib/functions.sh
index 05df7fa..03eb28b 100644
--- a/files/shlib/functions.sh
+++ b/files/shlib/functions.sh
@@ -204,10 +204,23 @@ autodie() {
 load_functions() {
    [ -n "${SHLIB-}" ] || die "\$SHLIB is not set."
    local f
+   local sdir
+   local IFS="${IFS_DEFAULT}"
    while [ $# -gt 0 ]; do
-      f="${SHLIB}/${1%.sh}.sh"
-      veinfo "Trying to load functions file ${f} ... "
-      . "${f}" || die "failed to load functions file ${f}."
+      f=
+      IFS=":"
+      for sdir in ${SHLIB}; do
+         IFS="${IFS_DEFAULT}"
+         f="${sdir}/${1%.sh}.sh"
+         if [ -f "${f}" ]; then
+            veinfo "Trying to load functions file ${f} ... "
+            . "${f}" || die "failed to load functions file ${f}."
+            break 1
+         else
+            f=
+         fi
+      done
+      [ -n "${f}" ] || die "failed to locate functions file '${1}'."
       shift
    done
    return 0