Skip to content
Snippets Groups Projects
Commit 74d56e4b authored by Eric Vidal's avatar Eric Vidal :speech_balloon:
Browse files

fix replacement of variable value

parent 665e8aa5
No related branches found
No related tags found
No related merge requests found
...@@ -57,21 +57,21 @@ if execl-toc -X -V LIVE_DIRECTORY; then ...@@ -57,21 +57,21 @@ if execl-toc -X -V LIVE_DIRECTORY; then
absolute_path "LIVE_DIRECTORY" "${LIVE_DIRECTORY}" absolute_path "LIVE_DIRECTORY" "${LIVE_DIRECTORY}"
66-yeller set live directory to: %b"${LIVE_DIRECTORY}"%n 66-yeller set live directory to: %b"${LIVE_DIRECTORY}"%n
sed -i "s:@LIVE_DIR@:-l ${LIVE_DIRECTORY}:" "${svscan}" || die "unable to set the live directory to use" sed -i "s:@live_dir@:-l ${LIVE_DIRECTORY}:" "${svscan}" || die "unable to set the live directory to use"
else else
66-yeller set live directory to: %b${MOD_LIVE}%n 66-yeller set live directory to: %b${MOD_LIVE}%n
sed -i "s:@LIVE_DIR@:-l ${MOD_LIVE}:" "${svscan}" || die "unable to set the live directory to use" sed -i "s:@live_dir@:-l ${MOD_LIVE}:" "${svscan}" || die "unable to set the live directory to use"
fi fi
if [ "${USE_ENVIRONMENT}" = yes ]; then if [ "${USE_ENVIRONMENT}" = yes ]; then
enable "setenv@${owner}" enable "setenv@${owner}"
sed -i "s:@USE_ENVIRONMENT@:-e ${home_env}:" "${svscan}" || die "unable to set environment directory to use" sed -i "s:@use_environment@:-e ${home_env}:" "${svscan}" || die "unable to set environment directory to use"
sed -i "s:@PATH_ENVIRONMENT@:${home_env}:g" "${FRONTEND_PATH}/setenv@" || die "unable to set environment directory to use" sed -i "s:@environment_path@:${home_env}:g" "${FRONTEND_PATH}/setenv@" || die "unable to set environment directory to use"
else else
disable "setenv@@I" disable "setenv@@I"
sed -i "s:@USE_ENVIRONMENT@::" "${svscan}" || die "unable to set environment directory to use" sed -i "s:@use_environment@::" "${svscan}" || die "unable to set environment directory to use"
fi fi
if [ "${LOGGER}" != "yes" ]; then if [ "${LOGGER}" != "yes" ]; then
...@@ -83,14 +83,14 @@ fi ...@@ -83,14 +83,14 @@ fi
if [ "${NOTIFY}" != "yes" ]; then if [ "${NOTIFY}" != "yes" ]; then
66-yeller %rdisable%n notification 66-yeller %rdisable%n notification
sed -i "s:@NOTIFY@::" "${svscan}" || die "unable to disable notification" sed -i "s:@notify@::" "${svscan}" || die "unable to disable notification"
sed -i "s:@notify:#@notify:" "${svscan}" || die "unable to disable notification" sed -i "s:@notify:#@notify:" "${svscan}" || die "unable to disable notification"
else else
66-yeller %benable%n notification 66-yeller %benable%n notification
sed -i "s:@NOTIFY@:-d3:" "${svscan}" || die "unable to enable notification" sed -i "s:@notify@:-d3:" "${svscan}" || die "unable to enable notification"
fi fi
66-yeller set verbosity level to: %b"${VERBOSITY_LEVEL}"%n 66-yeller set verbosity level to: %b"${VERBOSITY_LEVEL}"%n
sed -i "s:@VERBOSITY_LEVEL@:-v${VERBOSITY_LEVEL}:" "${svscan}" || die "unable to set verbosity" sed -i "s:@verbosity_level@:-v${VERBOSITY_LEVEL}:" "${svscan}" || die "unable to set verbosity"
66-yeller "%bsuccessfully%n configured" 66-yeller "%bsuccessfully%n configured"
...@@ -12,9 +12,9 @@ ...@@ -12,9 +12,9 @@
backtick -n HOME { homeof @I } backtick -n HOME { homeof @I }
importas -u HOME HOME importas -u HOME HOME
execl-toc -v3 -d @PATH_ENVIRONMENT@ execl-toc -v3 -d @environment_path@
redirfd -w 1 @PATH_ENVIRONMENT@/.svscan@@I redirfd -w 1 @environment_path@/.svscan@@I
## GENERAL VARIABLES ## GENERAL VARIABLES
......
...@@ -23,5 +23,5 @@ ...@@ -23,5 +23,5 @@
) )
[environment] [environment]
main_args=!@VERBOSITY_LEVEL@ @LIVE_DIR@ main_args=!@verbosity_level@ @live_dir@
scandir_args=!@NOTIFY@ @USE_ENVIRONMENT@ scandir_args=!@notify@ @use_environment@
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment