diff options
| author | Fredy <aluque@soleta.eu> | 2018-07-05 13:17:19 +0200 |
|---|---|---|
| committer | Fredy <aluque@soleta.eu> | 2018-07-05 13:17:19 +0200 |
| commit | e0c7c420aacda93edcdd16e0cd6c8192ea7f2310 (patch) | |
| tree | 7169e9bc12053316acc0c297f2f8b1293e7341da /client/engine/File.lib | |
| parent | 01ae374d4e8099b0d3c87dce8e0a8c44856bdf4f (diff) | |
| parent | d01525bd830f71c8ff9fe013a574a96a6622402b (diff) | |
Merge branch 'devel' of opengnsys.es:/git/opengnsys into devel
Diffstat (limited to 'client/engine/File.lib')
| -rwxr-xr-x | client/engine/File.lib | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/client/engine/File.lib b/client/engine/File.lib index f37e947d..1be1a338 100755 --- a/client/engine/File.lib +++ b/client/engine/File.lib @@ -229,7 +229,11 @@ rm -fr "$DIR" || ogRaiseError $OG_ERR_NOTFOUND "$*" || return $? #@version 0.9 - Pruebas con OpenGnSys. #@author Ramon Gomez, ETSII Universidad de Sevilla #@date 2009-09-15 +#@version 1.1.1 - Correccion comentarios autodocumentacion doxygen . +#@author Antonio J. Doblas Viso. Universidad de Malaga +#@date 2018-07-05 #*/ ## + function ogGetPath () { # Variables locales. @@ -266,7 +270,7 @@ case $# in esac # Eliminar caracteres \c / duplicados y finales. - # /* (comentario Doxygen) + FILE="$(echo $FILE|sed -e 's/\(\/\)*\1/\//g; s/\/$//')" # Comprobar si existe el fichero para reducir tiempos. if [ -e "$FILE" ]; then @@ -274,13 +278,14 @@ if [ -e "$FILE" ]; then else # Buscar el nombre correcto en cada subdirectorio del camino. FILEPATH="/" + while [ "$FILE" != "$PREVFILE" ]; do - FILEPATH="$(ls -d "${FILEPATH%/}/${FILE%%/*}" 2>/dev/null || find "$FILEPATH" -maxdepth 1 -iname "${FILE%%/*}" -print 2>/dev/null)" + FILEPATH="$(ls -d "${FILEPATH%/}/${FILE%%/*}" 2>/dev/null || find "$FILEPATH" -maxdepth 1 -iname "${FILE%%/*}" -print 2>/dev/null)" #*/ (Comentario Doxygen) PREVFILE="$FILE" - FILE="${FILE#*/}" + FILE="${FILE#*/}" done + fi - # (comentario Doxygen) */ [ -n "$FILEPATH" ] && echo "$FILEPATH" return 0 } @@ -294,6 +299,7 @@ return 0 #@author Ramon Gomez, ETSII Universidad de Sevilla #@date 2009-09-29 #*/ ## + function ogGetParentPath () { local PARENT |