From: Andreas Gerler <baron@bundesbrandschatzamt.de>
Date: Sun, 23 Nov 2014 18:37:36 +0000 (+0100)
Subject: snippets/cfengine3-mode/*: include filename by default.
X-Git-Url: http://git.bundesbrandschatzamt.de/?a=commitdiff_plain;h=8b178b0e4b03d245788352dcb9b3342acfcd5f14;p=emacsconfig.git

snippets/cfengine3-mode/*: include filename by default.

Signed-off-by: Andreas Gerler <baron@bundesbrandschatzamt.de>
---

diff --git a/snippets/cfengine3-mode/customlibservice b/snippets/cfengine3-mode/customlibservice
index c1290fae..82e1ff98 100644
--- a/snippets/cfengine3-mode/customlibservice
+++ b/snippets/cfengine3-mode/customlibservice
@@ -2,7 +2,7 @@
 # name: custserv
 # key: custserv
 # --
-#=head2 bundle agent customlib_${1:`(car (last (split-string (file-name-sans-extension (buffer-file-name)) "/" t)))`}
+#=head2 bundle agent customlib_${1:`(concat (replace-regexp-in-string "[ /.-]" "_" ( file-name-nondirectory (file-name-sans-extension (buffer-file-name)))) "_")`}
 #
 # $0
 #
diff --git a/snippets/cfengine3-mode/fileappend b/snippets/cfengine3-mode/fileappend
index 4fbd1d0b..d2243c08 100644
--- a/snippets/cfengine3-mode/fileappend
+++ b/snippets/cfengine3-mode/fileappend
@@ -2,7 +2,7 @@
 # name: fileappend
 # key: fileappend
 # --
-"${1:file}"
+"$1"
 handle => "${1:$(concat (replace-regexp-in-string "^bundle_agent_" "" (replace-regexp-in-string "[ /.-]" "_" (which-function))) "_edit" (replace-regexp-in-string "[ /.-]" "_" (yas-text)))}",
 comment => "configure $1",
 perms => mog("${3:644}","${4:root}","${5:root}"),
diff --git a/snippets/cfengine3-mode/filecplocal b/snippets/cfengine3-mode/filecplocal
index 49345bbc..6811f70b 100644
--- a/snippets/cfengine3-mode/filecplocal
+++ b/snippets/cfengine3-mode/filecplocal
@@ -3,7 +3,7 @@
 # key: filecplocal
 # --
 "${1:file}"
-handle => "create_$2",
+handle => "${1:$(concat (replace-regexp-in-string "^bundle_agent_" "" (replace-regexp-in-string "[ /.-]" "_" (which-function))) "_create" (replace-regexp-in-string "[ /.-]" "_" (yas-text)))}",
 comment => "copy $1",
 perms => mog("${3:644}","${4:root}","${5:root}"),
 copy_from => local_dcp("$(this.promise_dirname)/templates/${6}" );
diff --git a/snippets/cfengine3-mode/fileexpand b/snippets/cfengine3-mode/fileexpand
index 3c9e812e..844a0fd2 100644
--- a/snippets/cfengine3-mode/fileexpand
+++ b/snippets/cfengine3-mode/fileexpand
@@ -3,9 +3,9 @@
 # key: fileexpand
 # --
 "${1:file}"
-handle => "edit_$2",
+handle => "${1:$(concat (replace-regexp-in-string "^bundle_agent_" "" (replace-regexp-in-string "[ /.-]" "_" (which-function))) "_edit" (replace-regexp-in-string "[ /.-]" "_" (yas-text)))}",
 comment => "configure $1",
-perms => mog("${3:644}","${4:root}","${5:root}"),
-create => "${6:$$(yas-choose-value '("true" "false"))}",
+perms => mog("${2:644}","${3:root}","${4:root}"),
+create => "${5:$$(yas-choose-value '("true" "false"))}",
 edit_defaults => empty,
-edit_line => expand_variables( "\$(this.promise_dirname)/templates/${7}" );
+edit_line => expand_variables( "\$(this.promise_dirname)/templates/$6" );
diff --git a/snippets/cfengine3-mode/filequad b/snippets/cfengine3-mode/filequad
index def27971..6ea07138 100644
--- a/snippets/cfengine3-mode/filequad
+++ b/snippets/cfengine3-mode/filequad
@@ -3,8 +3,8 @@
 # key: filequad
 # --
 "${1:file}"
-handle => "create_$2",
+handle => "${1:$(concat (replace-regexp-in-string "^bundle_agent_" "" (replace-regexp-in-string "[ /.-]" "_" (which-function))) "_create" (replace-regexp-in-string "[ /.-]" "_" (yas-text)))}",
 comment => "copy $1",
-perms => mog("${3:644}","${4:root}","${5:root}"),
-create => "${6:$$(yas-choose-value '("true" "false"))}",
-copy_from => quad_remote_copy("$(this.promise_dirname)/templates/${7}","\${shared_global_environment.mps1}", "\${shared_global_environment.mps2}", "\${shared_global_environment.mps3}", "\${shared_global_environment.mps4}" );
+perms => mog("${2:644}","${3:root}","${4:root}"),
+create => "${5:$$(yas-choose-value '("true" "false"))}",
+copy_from => quad_remote_copy("$(this.promise_dirname)/templates/${6}","\${shared_global_environment.mps1}", "\${shared_global_environment.mps2}", "\${shared_global_environment.mps3}", "\${shared_global_environment.mps4}" );
diff --git a/snippets/cfengine3-mode/filesetval b/snippets/cfengine3-mode/filesetval
index 5587828f..184f7406 100644
--- a/snippets/cfengine3-mode/filesetval
+++ b/snippets/cfengine3-mode/filesetval
@@ -3,8 +3,8 @@
 # key: filesetval
 # --
 "${1:file}"
-handle => "edit_$2",
+handle => "${1:$(concat (replace-regexp-in-string "^bundle_agent_" "" (replace-regexp-in-string "[ /.-]" "_" (which-function))) "_edit" (replace-regexp-in-string "[ /.-]" "_" (yas-text)))}",
 comment => "configure $1",
-perms => mog("${3:600}","${4:root}","${5:root}"),
-create => "${6:$$(yas-choose-value '("true" "false"))}",
-edit_line => set_variable_values( "\$(this.bundle).${7}" );
+perms => mog("${2:600}","${3:root}","${4:root}"),
+create => "${5:$$(yas-choose-value '("true" "false"))}",
+edit_line => set_variable_values( "\$(this.bundle).${6}" );
diff --git a/snippets/cfengine3-mode/filesetvalini b/snippets/cfengine3-mode/filesetvalini
index 8bd6ad69..69563dda 100644
--- a/snippets/cfengine3-mode/filesetvalini
+++ b/snippets/cfengine3-mode/filesetvalini
@@ -3,8 +3,8 @@
 # key: filesetvalini
 # --
 "${1:file}"
-handle => "edit_$2",
+handle => "${1:$(concat (replace-regexp-in-string "^bundle_agent_" "" (replace-regexp-in-string "[ /.-]" "_" (which-function))) "_edit" (replace-regexp-in-string "[ /.-]" "_" (yas-text)))}",
 comment => "configure $1",
-perms => mog("${3:600}","${4:root}","${5:root}"),
-create => "${6:$$(yas-choose-value '("true" "false"))}",
-edit_line => set_variable_values_ini( "\$(this.bundle).${7}", "${8:section}" );
+perms => mog("${2:600}","${3:root}","${4:root}"),
+create => "${5:$$(yas-choose-value '("true" "false"))}",
+edit_line => set_variable_values_ini( "\$(this.bundle).${6}", "${7:section}" );
diff --git a/snippets/cfengine3-mode/filetemplate b/snippets/cfengine3-mode/filetemplate
index 2068bc47..34224a40 100644
--- a/snippets/cfengine3-mode/filetemplate
+++ b/snippets/cfengine3-mode/filetemplate
@@ -3,8 +3,8 @@
 # key: filetemplate
 # --
 "${1:file}"
-handle => "edit_$2",
+handle => "${1:$(concat (replace-regexp-in-string "^bundle_agent_" "" (replace-regexp-in-string "[ /.-]" "_" (which-function))) "_edit" (replace-regexp-in-string "[ /.-]" "_" (yas-text)))}",
 comment => "configure $1",
-perms => mog("${3:440}","${4:root}","${5:root}"),
-create => "${6:$$(yas-choose-value '("true" "false"))}",
-edit_template => "\$(this.promise_dirname)/templates/${7}";
+perms => mog("${2:440}","${3:root}","${4:root}"),
+create => "${5:$$(yas-choose-value '("true" "false"))}",
+edit_template => "\$(this.promise_dirname)/templates/${6}";
diff --git a/snippets/cfengine3-mode/mkdir b/snippets/cfengine3-mode/mkdir
index 90923049..30674775 100644
--- a/snippets/cfengine3-mode/mkdir
+++ b/snippets/cfengine3-mode/mkdir
@@ -3,7 +3,7 @@
 # key: mkdir
 # --
 "${1:file}/."
-handle    => "\$(this.bundle)_$2",
-comment   => "$3",
-create    => "${4:$$(yas-choose-value '("true" "false"))}",
-perms     => mog("${5:700}","${6:root}","${7:root}");
+handle => "${1:$(concat (replace-regexp-in-string "^bundle_agent_" "" (replace-regexp-in-string "[ /.-]" "_" (which-function))) "_mkdir" (replace-regexp-in-string "[ /.-]" "_" (yas-text)))}",
+comment   => "mkdir $1",
+create    => "${3:$$(yas-choose-value '("true" "false"))}",
+perms     => mog("${4:700}","${5:root}","${6:root}");
diff --git a/snippets/cfengine3-mode/usebund b/snippets/cfengine3-mode/usebund
index 326c44ae..e0e4dc38 100644
--- a/snippets/cfengine3-mode/usebund
+++ b/snippets/cfengine3-mode/usebund
@@ -2,4 +2,4 @@
 # name: usebund
 # key: usebund
 # --
-"customlib_`(car (last (split-string (file-name-sans-extension (buffer-file-name)) "/" t)))`_$2" usebundle => customlib_`(car (last (split-string (file-name-sans-extension (buffer-file-name)) "/" t)))`_$2;
+"customlib_`(replace-regexp-in-string "[ /.-]" "_" ( file-name-nondirectory (file-name-sans-extension (buffer-file-name))))`_$1" usebundle => customlib_`(replace-regexp-in-string "[ /.-]" "_" ( file-name-nondirectory (file-name-sans-extension (buffer-file-name))))`_$1;