more work on env variable parsing

.vscode/settings.json

@@ -4,6 +4,9 @@
         "knadh",
         "koanf",
         "mattn",
+        "maunium",
+        "mautrix",
+        "nikoksr",
         "Strs"
     ]
 }

docs/content/config/commands.md

@@ -103,7 +103,7 @@ May be `scriptFile` or `script`. Runs script from local machine on remote host p
 
 If `type` is `script`, `cmd` is used as the script.
 
-If `type` is `scriptFile`, cmd must be a file path.
+If `type` is `scriptFile`, cmd must be a script file.
 
 ### environment
 

pkg/backy/config.go

@@ -22,6 +22,11 @@ var homeDirErr error
 var backyHomeConfDir string
 var configFiles []string
 
+const macroStart string = "%{"
+const macroEnd string = "}%"
+const envMacroStart string = "%{env:"
+const vaultMacroStart string = "%{env:"
+
 func (opts *ConfigOpts) InitConfig() {
 
 	homeDir, homeDirErr = os.UserHomeDir()

pkg/backy/utils.go

@@ -221,10 +221,15 @@ func expandEnvVars(backyEnv map[string]string, envVars []string) {
 		return ""
 	}
 
+	// parse env variables using new macros
 	for indx, v := range envVars {
-		if strings.Contains(v, "$") || (strings.Contains(v, "${") && strings.Contains(v, "}")) {
+		if strings.HasPrefix(v, macroStart) && strings.HasSuffix(v, macroEnd) {
+			if strings.HasPrefix(v, envMacroStart) {
+				v = strings.TrimPrefix(v, envMacroStart)
+				v = strings.TrimRight(v, macroEnd)
 				out, _ := shell.Expand(v, env)
 				envVars[indx] = out
 			}
 		}
+	}
 }