pff: ajout de la commande normalisée new_cmd_amue_clean_libs
This commit is contained in:
parent
b3a44d07ad
commit
6af03598c8
43
pff
43
pff
@ -618,12 +618,17 @@ function autoinit() {
|
|||||||
fi
|
fi
|
||||||
# Lancer les commandes AUTO_CMDS
|
# Lancer les commandes AUTO_CMDS
|
||||||
local cwd cmd
|
local cwd cmd
|
||||||
cwd="$(pwd)"
|
if [ ${#AUTO_CMDS[*]} -gt 0 ]; then
|
||||||
cd "$pffdir"
|
eetitle "AutoCmds"
|
||||||
for cmd in "${AUTO_CMDS[@]}"; do
|
cwd="$(pwd)"
|
||||||
eval "$cmd"
|
cd "$pffdir"
|
||||||
done
|
for cmd in "${AUTO_CMDS[@]}"; do
|
||||||
cd "$cwd"
|
estep "\$ $cmd"
|
||||||
|
eval "$cmd"
|
||||||
|
done
|
||||||
|
cd "$cwd"
|
||||||
|
eend
|
||||||
|
fi
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -854,6 +859,15 @@ function new__prepare_archive() {
|
|||||||
local "$destver"; upvar "$destver" "$version"
|
local "$destver"; upvar "$destver" "$version"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function new_cmd_amue_clean_libs() {
|
||||||
|
# en mode distribution "patch", supprimer le contenu du répertoire
|
||||||
|
# WEB-INF/lib si ces fichiers sont relivrés
|
||||||
|
[ "$DISTTYPE" == patch ] || return
|
||||||
|
if [ -n "$(/bin/ls -d "$srcdir/WEB-INF/lib"/* 2>/dev/null)" ]; then
|
||||||
|
rm -f WEB-INF/lib/*
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
function new_cmd() {
|
function new_cmd() {
|
||||||
local autopatch="$1" version="$2" disttype="$3" unwrap="$4" merge_strategy="$5" commit_policy="$6"; shift; shift; shift; shift; shift; shift
|
local autopatch="$1" version="$2" disttype="$3" unwrap="$4" merge_strategy="$5" commit_policy="$6"; shift; shift; shift; shift; shift; shift
|
||||||
local archive="$1" pffdir="$2"
|
local archive="$1" pffdir="$2"
|
||||||
@ -868,12 +882,17 @@ function new_cmd() {
|
|||||||
|
|
||||||
## Lancer les commandes
|
## Lancer les commandes
|
||||||
local cwd cmd
|
local cwd cmd
|
||||||
cwd="$(pwd)"
|
if [ ${#NEW_CMDS[*]} -gt 0 ]; then
|
||||||
cd "$pffdir"
|
etitle "NewCmds"
|
||||||
for cmd in "${NEW_CMDS[@]}"; do
|
cwd="$(pwd)"
|
||||||
eval "$cmd"
|
cd "$pffdir"
|
||||||
done
|
for cmd in "${NEW_CMDS[@]}"; do
|
||||||
cd "$cwd"
|
estep "\$ $cmd"
|
||||||
|
eval "$cmd"
|
||||||
|
done
|
||||||
|
cd "$cwd"
|
||||||
|
eend
|
||||||
|
fi
|
||||||
|
|
||||||
## lister les fichiers dans la source et la destination
|
## lister les fichiers dans la source et la destination
|
||||||
local workdir
|
local workdir
|
||||||
|
Loading…
Reference in New Issue
Block a user