modules
/
nutools
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ulib/runs: quelques corrections mineures

This commit is contained in:
Jephté Clain 2017-02-10 12:14:30 +04:00
parent e9e4e6a56e
commit a8fa7227b8
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/ulib/runs
View File

@ -500,7 +500,7 @@ function runs_find_scriptfile() {
"$__runsdir/$__runshost/$__scriptfile" \ "$__runsdir/$__runshost/$__scriptfile" \
"$__runsdir/$__domain/$__hostname/$__scriptfile"; do "$__runsdir/$__domain/$__hostname/$__scriptfile"; do
if [ "${__runsfile%$__runsext}" == "$__runsfile" ]; then if [ "${__runsfile%$__runsext}" == "$__runsfile" ]; then
[ ! -f "$__runsfile" -a -f "$__runsfile$__runsext" ] && __runsfile="$__runsfile$__runsext" [ ! -e "$__runsfile" -a -e "$__runsfile$__runsext" ] && __runsfile="$__runsfile$__runsext"
fi fi
if [ -e "$__runsfile" ]; then if [ -e "$__runsfile" ]; then
runs_initvars "$__runsfile" "$__runsdir" "$__runsdirpath" "$__scriptfile" runs_initvars "$__runsfile" "$__runsdir" "$__runsdirpath" "$__scriptfile"
@ -513,7 +513,7 @@ function runs_find_scriptfile() {
for __runsdir in "${!__runsscriptsdirs}" "${!__runsmodulesdirs}"; do for __runsdir in "${!__runsscriptsdirs}" "${!__runsmodulesdirs}"; do
__runsfile="$__runsdir/$__scriptfile" __runsfile="$__runsdir/$__scriptfile"
if [ "${__runsfile%$__runsext}" == "$__runsfile" ]; then if [ "${__runsfile%$__runsext}" == "$__runsfile" ]; then
[ ! -f "$__runsfile" -a -f "$__runsfile$__runsext" ] && __runsfile="$__runsfile$__runsext" [ ! -e "$__runsfile" -a -e "$__runsfile$__runsext" ] && __runsfile="$__runsfile$__runsext"
fi fi
if [ -e "$__runsfile" ]; then if [ -e "$__runsfile" ]; then
runs_initvars "$__runsfile" "$__runsdir" "$__runsdir" "$__scriptfile" runs_initvars "$__runsfile" "$__runsdir" "$__runsdir" "$__scriptfile"
@ -1143,6 +1143,11 @@ function runs_set_lang() {
source_ifexists /etc/default/locale source_ifexists /etc/default/locale
set_var_cmd LANG "$LANG" set_var_cmd LANG "$LANG"
)" )"
elif check_sysinfos -d redhatlike; then
eval "$(LANG=
source_ifexists /etc/locale.conf
set_var_cmd LANG "$LANG"
)"
fi fi
export LANG export LANG
fi fi
@ -1909,6 +1914,9 @@ function runs_action_export() {
fi fi
if [ ! -e "$RUNSROOTDIR$RUNSSCRIPT" ]; then 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" estep "Copie du script"
mkdirof "$RUNSROOTDIR$RUNSSCRIPT" mkdirof "$RUNSROOTDIR$RUNSSCRIPT"
cpnovcs "$RUNSSCRIPT" "$(dirname "$RUNSROOTDIR$RUNSSCRIPT")" cpnovcs "$RUNSSCRIPT" "$(dirname "$RUNSROOTDIR$RUNSSCRIPT")"