Prepare for the next 66 release.

Change identifier, Fix seed_directory replacement.
Avoid conflict with identifier from 66.
Make a distinction between Makefile variable replacement
and module replacement inside frontend file.

Makefile

@@ -21,17 +21,17 @@ install-script: $(SCRIPT_TARGET:module/configure/%=$(DESTDIR)$(service_directory
 
 $(DESTDIR)$(service_directory)/$(package)/%: module/%
 	exec $(INSTALL) -D -m 644 $< $@
-	sed -i -e 's,@VERSION@,$(version),' \
-		-e "s,@LIVEDIR@,$(livedir)," \
-		-e "s,@USER_CONF_DIR@,$(service_userconf)," \
-		-e "s,@LOGGER@,$(LOGGER)," \
-		-e "s,@USE_ENVIRONMENT@,$(USE_ENVIRONMENT)," \
-		-e "s,@VERBOSITY_LEVEL@,$(VERBOSITY_LEVEL)," \
-		-e "s,@NOTIFY@,$(NOTIFY)," $@
+	sed -i -e 's,%%VERSION%,$(version),' \
+		-e "s,%%LIVEDIR%%,$(livedir)," \
+		-e "s,%%USER_CONF_DIR%%,$(service_userconf)," \
+		-e "s,%%LOGGER%%,$(LOGGER)," \
+		-e "s,%%USE_ENVIRONMENT%%,$(USE_ENVIRONMENT)," \
+		-e "s,%%VERBOSITY_LEVEL%%,$(VERBOSITY_LEVEL)," \
+		-e "s,%%NOTIFY%%,$(NOTIFY)," $@
 
 $(DESTDIR)$(service_directory)/$(package)/configure/%: module/configure/%
 	exec $(INSTALL) -D -m 755 $< $@
-	sed -i -e 's,@BINDIR@,$(bindir),' $@
+	sed -i -e 's,%%BINDIR%%,$(bindir),' $@
 
 version:
 	@echo $(version)

module/configure/configure

-#!@BINDIR@/sh
+#!%%BINDIR%%/sh
 
 ## 66-yeller variable
 export PROG="${MOD_NAME}"
@@ -57,21 +57,21 @@ if execl-toc -X -V LIVE_DIRECTORY; then
     absolute_path "LIVE_DIRECTORY" "${LIVE_DIRECTORY}"
 
     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:%%livedir%%:-l ${LIVE_DIRECTORY}:" "${svscan}" || die "unable to set the live directory to use"
 else
     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:%%livedir%%:-l ${MOD_LIVE}:" "${svscan}" || die "unable to set the live directory to use"
 fi
 
 if [ "${USE_ENVIRONMENT}" = yes ]; then
 
     enable "setenv@${owner}"
 
-    sed -i "s:@use_environment@:-e ${home_env}:" "${svscan}" || 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"
+    sed -i "s:%%use_environment%%:-e ${home_env}:" "${svscan}" || 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
     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
 
 if [ "${LOGGER}" != "yes" ]; then
@@ -83,14 +83,14 @@ fi
 
 if [ "${NOTIFY}" != "yes" ]; then
     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"
 else
     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
 
 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"

module/frontend/setenv@

 [main]
 @type = oneshot
-@version = @version@
+@version = %%version%%
 @description = "Set well-know variables for @I user"
 @user = ( root )
 
@@ -12,9 +12,9 @@
     backtick -n HOME { homeof @I }
     importas -u HOME HOME
 
-    execl-toc -v3 -d @environment_path@
+    execl-toc -v3 -d %%environment_path%%
 
-    redirfd -w 1 @environment_path@/.svscan@@I
+    redirfd -w 1 %%environment_path%%/.svscan@@I
 
     ## GENERAL VARIABLES
 

module/frontend/svscan@

 [main]
 @type = classic
-@version = @version@
+@version = %%version%%
 @description = "Create and start a nested scandir for @I"
 @user = ( root )
 @depends = ( setenv@@I )
@@ -23,6 +23,6 @@
 )
 
 [environment]
-Args66=!@verbosity_level@ @live_dir@
-ArgsScandirStart=!start @notify@ @use_environment@
+Args66=!%%verbosity_level%% %%livedir%%
+ArgsScandirStart=!start %%notify%% %%use_environment%%
 ArgsScandirStop=!stop

module/scandir@

 [main]
 @type = module
-@version = @VERSION@
+@version = %%VERSION%
 @description = "Create a nested scandir for @I"
 @user = ( root )
 @intree = session
@@ -9,28 +9,28 @@
 @configure="@I"
 @files = ( @M=@I )
 @infiles = (
-::@version@=@VERSION@ )
+::%%version%%=%%VERSION% )
 
 [environment]
 ## Run the scandir at LIVE_DIRECTORY.
 ## Need to be an absolute path.
-## If commented the default is @LIVEDIR@
+## If commented the default is %%LIVEDIR%%
 
-#LIVE_DIRECTORY=@LIVEDIR@
+#LIVE_DIRECTORY=%%LIVEDIR%%
 
 ## Create an associated logger [yes|no]
 
-@LOGGER@
+%%LOGGER%%
 
 ## Launch the scandir with a environment [yes|no].
-## The environment directory is: $HOME/@USER_CONF_DIR@/svscan@@I
+## The environment directory is: $HOME/%%USER_CONF_DIR%%/svscan@@I
 
-@USE_ENVIRONMENT@
+%%USE_ENVIRONMENT%%
 
 ## Use notification [yes|no]
 
-@NOTIFY@
+%%NOTIFY%%
 
 ## Level of verbosity [0-5]
 
-@VERBOSITY_LEVEL@
+%%VERBOSITY_LEVEL%%