fix missing variables

dotdrop/options.py

@@ -109,9 +109,11 @@ class Options(AttrMonitor):
         """constructor
         @args: argument dictionary (if None use sys)
         """
-        self.args = args
+        self.args = {}
         if not args:
             self.args = docopt(USAGE, version=VERSION)
+        if args:
+            self.args = args.copy()
         self.log = Logger()
         self.debug = self.args['--verbose'] or ENV_DEBUG in os.environ
         self.dry = self.args['--dry']

tests-ng/ignore-empty.sh

@@ -76,7 +76,7 @@ _EOF
 
 # create the dotfile
 mkdir -p ${tmps}/dotfiles/d1
-echo "{{@@ var1 @@}}" > ${tmps}/dotfiles/d1/empty
+echo "{#@@ should be stripped @@#}" > ${tmps}/dotfiles/d1/empty
 echo "not empty" > ${tmps}/dotfiles/d1/notempty
 
 # install

tests/helpers.py

@@ -158,7 +158,6 @@ def load_options(confpath, profile):
     o.import_link = LinkTypes.NOLINK
     o.install_showdiff = True
     o.debug = True
-    o.variables = {}
     return o
 
 

tests/test_install.py

@@ -186,7 +186,6 @@ exec bspwm
         o = load_options(confpath, profile)
         o.safe = False
         o.install_showdiff = True
-        o.variables = {}
         cmd_install(o)
 
         # now compare the generated files