Prepare the next release of 66

Makefile

@@ -24,15 +24,16 @@ install-seed: $(SEED_TARGET:module/configure/session=$(DESTDIR)$(seed_directory)
 
 $(DESTDIR)$(service_directory)/$(package)/%: module/%
 	exec $(INSTALL) -D -m 644 $< $@
-	sed -i -e 's,@VERSION@,$(version),' \
-		-e "s,@DISPLAY_MANAGER@,$(DISPLAY_MANAGER)," \
-		-e "s,@CONSOLE_TRACKER@,$(CONSOLE_TRACKER)," \
-		-e "s,@XDG_RUNTIME@,$(XDG_RUNTIME)," \
-		-e "s,@DESKTOP_CMDLINE@,$(DESKTOP_CMDLINE)," $@
+	sed -i -e 's,%%VERSION%%,$(version),' \
+		-e "s,%%DISPLAY_MANAGER%%,$(DISPLAY_MANAGER)," \
+		-e "s,%%CONSOLE_TRACKER%%,$(CONSOLE_TRACKER)," \
+		-e "s,%%XDG_RUNTIME%%,$(XDG_RUNTIME)," \
+		-e "s,%%DESKTOP_CMDLINE%%,$(DESKTOP_CMDLINE)," $@
 
 $(DESTDIR)$(service_directory)/$(package)/configure/%: module/configure/%
 	exec $(INSTALL) -D -m 755 $< $@
-	sed -i -e 's,@BINDIR@,$(bindir),' $@
+	sed -i -e 's,%%BINDIR%%,$(bindir),' \
+		-e 's,%%EXECLINEDIR%%,$(execlinedir),' $@
 
 $(DESTDIR)$(seed_directory)/session: module/configure/session
 	exec $(INSTALL) -D -m 644 $< $@

module/boot-user@

 [main]
 @type = module
-@version = @VERSION@
+@version = %%VERSION%%
 @description = "Configure a nested supervision tree for @I user"
 @user = ( root )
 @depends = ( scandir@@I )
@@ -8,7 +8,9 @@
 
 [regex]
 @configure = "@I"
-@infiles = ( ::@version@=@VERSION@ )
+@infiles = (
+    ::%%version%%=%%VERSION%%
+)
 
 [environment]
 ## Uncomment it to use a display manager.
@@ -17,22 +19,22 @@
 ## e.g sddm,lightdm,...
 ## It also prepare the .xsession file.
 
-@DISPLAY_MANAGER@
+%%DISPLAY_MANAGER%%
 
 ## Uncomment it to use a console tracker.
 ## Can be any console tracker as long as the
 ## corresponding frontend file exist on your system
 ## e.g consolekit,seatd,turnstile,...
 
-@CONSOLE_TRACKER@
+%%CONSOLE_TRACKER%%
 
 ## Create and mount the XDG_RUNTIME directory
 ## at /run/user/@I [yes|no]
 
-@XDG_RUNTIME@
+%%XDG_RUNTIME%%
 
 ## Command to use in your .xinitrc
 ## to launch your desktop e.g.: openbox-session.
 ## If commented the .xinitrc file is not configured.
 
-@DESKTOP_CMDLINE@
+%%DESKTOP_CMDLINE%%

module/configure/.xinitrc

-#!@BINDIR@/bash
+#!%%BINDIR%%/bash
 
 if [ -d /etc/X11/xinit/xinitrc.d ] ; then
  for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do
@@ -7,9 +7,9 @@ if [ -d /etc/X11/xinit/xinitrc.d ] ; then
  unset f
 fi
 
-list=( $(ls -A1 @PATH_ENVIRONMENT@ | sort) )
+list=( $(ls -A1 %%PATH_ENVIRONMENT%% | sort) )
 for i in ${list[@]};do
-    var=( $(<@PATH_ENVIRONMENT@/${i}) )
+    var=( $(<%%PATH_ENVIRONMENT%%/${i}) )
     for j in ${var[@]}; do
         export ${j}
     done
@@ -25,4 +25,4 @@ else
 fi
 
 ## Select the session to start
-${cmd} @DESKTOP_CMDLINE@
+${cmd} %%DESKTOP_CMDLINE%%

module/configure/.xsession

-#!@BINDIR@/bash
+#!%%BINDIR%%/bash
 
-list=( $(ls -A1 @PATH_ENVIRONMENT@ | sort) )
+list=( $(ls -A1 %%PATH_ENVIRONMENT%% | sort) )
 for i in ${list[@]};do
-    var=( $(<@PATH_ENVIRONMENT@/${i}) )
+    var=( $(<%%PATH_ENVIRONMENT%%/${i}) )
     for j in ${var[@]}; do
         export ${j}
     done

module/configure/configure

-#!@BINDIR@/sh
+#!%%BINDIR%%/sh
 
 ## 66-yeller variable
 export PROG="${MOD_NAME}"
@@ -12,7 +12,7 @@ ACTIVATED_PATH="${MOD_MODULE_DIR}/activated"
 DEPENDS_PATH="${ACTIVATED_PATH}/depends"
 
 owner="${1}"
-home=$(homeof "${owner}")
+home=$(%%EXECLINEDIR%%/homeof "${owner}")
 uid=$(id -u "${owner}")
 gid=$(id -g "${owner}")
 
@@ -32,7 +32,7 @@ check_empty_var(){
 
 depends(){
     name="${1}"
-    66-yeller %badd%n dependency: "${consolekit}"
+    66-yeller %badd%n dependency: "${name}"
     touch  "${DEPENDS_PATH}/${name}" || die "unable to add dependency ${MOD_MODULE_DIR}/service/${name}"
 }
 
@@ -59,7 +59,7 @@ if execl-toc -X -V DISPLAY_MANAGER; then
     depends "${DISPLAY_MANAGER}"
 
     66-yeller set environment at .xsession file to: %b"${home_env}"%n
-    sed -i "s:@PATH_ENVIRONMENT@:${home_env}:g" ".xsession" || die "unable to set environment directory at .xsession file"
+    sed -i "s:%%PATH_ENVIRONMENT%%:${home_env}:g" ".xsession" || die "unable to set environment directory at .xsession file"
 
     if [ -e "${home}/.xsession" ]; then
         random=$(date +%M%N)
@@ -92,9 +92,9 @@ if execl-toc -X -V DESKTOP_CMDLINE; then
     check_empty_var "DESKTOP_CMDLINE" "${DESKTOP_CMDLINE}"
 
     66-yeller set environment at .xinitrc file to: %b"${home_env}"%n
-    sed -i "s:@PATH_ENVIRONMENT@:${home_env}:g" ".xinitrc" || die "unable to set environment directory at .xinitrc file"
+    sed -i "s:%%PATH_ENVIRONMENT%%:${home_env}:g" ".xinitrc" || die "unable to set environment directory at .xinitrc file"
     66-yeller set commandline at .xinitrc file to: %b"${DESKTOP_CMDLINE}"%n
-    sed -i "s:@DESKTOP_CMDLINE@:${DESKTOP_CMDLINE}:g" ".xinitrc" || die "unable to set environment directory at .xinitrc file"
+    sed -i "s:%%DESKTOP_CMDLINE%%:${DESKTOP_CMDLINE}:g" ".xinitrc" || die "unable to set environment directory at .xinitrc file"
 
     if [ -e "${home}/.xinitrc" ]; then
         random=$(date +%M%N)

module/frontend/mount-run@

 [main]
 @type = oneshot
-@version = @version@
+@version = %%version%%
 @description = "Mount /run/user directory of user @I"
 @user = ( root )