Fix expansion of env vars not working in the :opt:env directive

Fixes #1075

docs/changelog.rst

@@ -22,6 +22,10 @@ Changelog
 
 - macOS: Fix drag and drop of files not working on mojave (:iss:`1058`)
 
+
+- Fix expansion of env vars not working in the :opt:`env` directive
+  (:iss:`1075`)
+
 0.12.3 [2018-09-29]
 ------------------------------
 

kitty/config.py

@@ -337,7 +337,7 @@ def expandvars(val, env):
             result = m.group()
         return result
 
-    return re.sub(r'$\{(\S+)\}', sub, val)
+    return re.sub(r'\$\{(\S+?)\}', sub, val)
 
 
 @special_handler

kitty/config_data.py

@@ -703,7 +703,7 @@ Specify environment variables to set in all child processes. Note that
 environment variables are expanded recursively, so if you use::
 
     env MYVAR1=a
-    env MYVAR2=${MYVAR}/${HOME}/b
+    env MYVAR2=${MYVAR1}/${HOME}/b
 
 The value of MYVAR2 will be :code:`a/<path to home directory>/b`.
 '''))