From a8fa7227b8adb377599eddff1ba13456bc5d9e1a Mon Sep 17 00:00:00 2001 From: Jephte Clain Date: Fri, 10 Feb 2017 12:14:30 +0400 Subject: [PATCH] ulib/runs: quelques corrections mineures --- lib/ulib/runs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/lib/ulib/runs b/lib/ulib/runs index 1f9aa55..6968329 100644 --- a/lib/ulib/runs +++ b/lib/ulib/runs @@ -500,7 +500,7 @@ function runs_find_scriptfile() { "$__runsdir/$__runshost/$__scriptfile" \ "$__runsdir/$__domain/$__hostname/$__scriptfile"; do if [ "${__runsfile%$__runsext}" == "$__runsfile" ]; then - [ ! -f "$__runsfile" -a -f "$__runsfile$__runsext" ] && __runsfile="$__runsfile$__runsext" + [ ! -e "$__runsfile" -a -e "$__runsfile$__runsext" ] && __runsfile="$__runsfile$__runsext" fi if [ -e "$__runsfile" ]; then runs_initvars "$__runsfile" "$__runsdir" "$__runsdirpath" "$__scriptfile" @@ -513,7 +513,7 @@ function runs_find_scriptfile() { for __runsdir in "${!__runsscriptsdirs}" "${!__runsmodulesdirs}"; do __runsfile="$__runsdir/$__scriptfile" if [ "${__runsfile%$__runsext}" == "$__runsfile" ]; then - [ ! -f "$__runsfile" -a -f "$__runsfile$__runsext" ] && __runsfile="$__runsfile$__runsext" + [ ! -e "$__runsfile" -a -e "$__runsfile$__runsext" ] && __runsfile="$__runsfile$__runsext" fi if [ -e "$__runsfile" ]; then runs_initvars "$__runsfile" "$__runsdir" "$__runsdir" "$__scriptfile" @@ -1143,6 +1143,11 @@ function runs_set_lang() { source_ifexists /etc/default/locale set_var_cmd LANG "$LANG" )" + elif check_sysinfos -d redhatlike; then + eval "$(LANG= + source_ifexists /etc/locale.conf + set_var_cmd LANG "$LANG" + )" fi export LANG fi @@ -1909,6 +1914,9 @@ function runs_action_export() { fi if [ ! -e "$RUNSROOTDIR$RUNSSCRIPT" ]; then + # le script est peut ĂȘtre un lien + local -a __CPNOVCS_RSYNC_ARGS; __CPNOVCS_RSYNC_ARGS=(--copy-links) + estep "Copie du script" mkdirof "$RUNSROOTDIR$RUNSSCRIPT" cpnovcs "$RUNSSCRIPT" "$(dirname "$RUNSROOTDIR$RUNSSCRIPT")"