sequpgrade - fix some variable rename regex statements

This commit is contained in:
2022-06-01 14:27:28 +02:00
parent 2ea45fd9fd
commit e4e909c946
4 changed files with 27 additions and 27 deletions

View File

@@ -22,7 +22,7 @@ seq_config() {
else
dry || return 1
fi
toolSyslogTag="${SCRIPT_NAME}-$SEQ_PROFILE_NAME"
toolSyslogTag="${SCRIPT_NAME}-$seq_profileName"
}
step_1_info() {
@@ -30,7 +30,7 @@ step_1_info() {
if contextHelp ; then
echo -n "selected profile"
else
echo -n "profile: $SEQ_PROFILE_NAME"
echo -n "profile: $seq_profileName"
fi
echo " [OPTIONS] [full|incremental]"
echoinfo " [OPTIONS]"
@@ -55,7 +55,7 @@ step_1() {
done
if [ -z $EBU_TARGET ] || [ -z $EBU_SOURCE ] ; then
echo " [I] Nothing to do. Check $SEQ_CONFIG_FILE"
echo " [I] Nothing to do. Check $seq_configFile"
return 1
fi
@@ -66,7 +66,7 @@ step_1() {
return 1
fi
echo " [I] Running backup profile [$SEQ_PROFILE_NAME]"
echo " [I] Running backup profile [$seq_profileName]"
if [ "${dupArgs[0]}" != "full" ] && [ ! -z "$EBU_MAX_FULLBKP_AGE" ] ; then
dupArgs+=(--full-if-older-than "$EBU_MAX_FULLBKP_AGE")
@@ -94,7 +94,7 @@ step_3() {
shift
if [ -z $EBU_TARGET ] || [ -z $EBU_SOURCE ] ; then
echo " [I] Nothing to do. Check $SEQ_CONFIG_FILE"
echo " [I] Nothing to do. Check $seq_configFile"
return 1
fi
@@ -185,7 +185,7 @@ step_20_info() {
elif [ ! -z "$1" ]; then
echo "Status of target: $ebuTarget"
else
echo "Status of profile \"$SEQ_PROFILE_NAME\" target: $ebuTarget"
echo "Status of profile \"$seq_profileName\" target: $ebuTarget"
fi
}
step_20_alias() { echo 'status'; }
@@ -219,7 +219,7 @@ step_70_info() {
if contextHelp ; then
echo -n "selected profile"
else
echo -n "profile: $SEQ_PROFILE_NAME"
echo -n "profile: $seq_profileName"
fi
echo " [OPTIONS]"
echoinfo " [OPTIONS]"
@@ -230,9 +230,9 @@ step_70() {
shift
local arg
local cronRemove=0
local cronScript="$toolCronDir/${toolPrefix}$SEQ_PROFILE_NAME"
local cronScript="$toolCronDir/${toolPrefix}$seq_profileName"
local cronLog='>/dev/null'
local cronEntry="$EBU_CRONTIME $(whoami) $WDIR/$(basename -- $0) -qq -p $SEQ_PROFILE_NAME"
local cronEntry="$EBU_CRONTIME $(whoami) $WDIR/$(basename -- $0) -qq -p $seq_profileName"
for arg in "$@" ; do
case "$1" in
@@ -244,7 +244,7 @@ step_70() {
done
if [ ! -z "$EBU_LOG_DIR" ] ; then
cronLog="$EBU_LOG_DIR/${toolPrefix}${SEQ_PROFILE_NAME}.log"
cronLog="$EBU_LOG_DIR/${toolPrefix}${seq_profileName}.log"
exe touch "$cronLog"
exe chmod 600 "$cronLog"
fi
@@ -252,16 +252,16 @@ step_70() {
cronEntry+=" >$cronLog"
if [ -z "$EBU_CRONTIME" ] || [ $cronRemove -ne 0 ] ; then
echo " [I] Removing cron for profile $SEQ_PROFILE_NAME"
echo " [I] Removing cron for profile $seq_profileName"
exe rm -r "$cronScript"
else
checkFileHead "$cronScript" "$cronEntry"
if [ $? -ne 0 ] ; then
echo " [I] Update cron for profile $SEQ_PROFILE_NAME"
echo " [I] Update cron for profile $seq_profileName"
exep "sudo echo \"$cronEntry\" > \"$cronScript\""
syslogEntry "Cron file update complete [$EBU_CRONTIME]"
else
echo " [I] Cron for profile $SEQ_PROFILE_NAME is up to date"
echo " [I] Cron for profile $seq_profileName is up to date"
fi
fi
}
@@ -269,9 +269,9 @@ step_70() {
step_72_info() { echo "Update all profile cron files"; }
step_72_alias() { echo "reload"; }
step_72() {
for seq in "$SEQ_CONFIG_HOME/"* ; do
for seq in "$seq_configRoot/"* ; do
seq=$(basename ${seq})
$WDIR/$(basename -- $0) $SEQUENCER_ARGS -qq -p ${seq%%.*} cron
$WDIR/$(basename -- $0) $sqr_args -qq -p ${seq%%.*} cron
done
}