Merge pull request #5 from quinkennedy/escape-amp

Escaping ampersand characters

Author: jmwohl

extension.js

@@ -40,8 +40,11 @@ function _replaceTokens(filePath, tokens) {
     function replace(token, value) {
         // tokens start with a $ which needs to be escaped, oops
         var _token = '\\' + token,
+            // any '&' character needs to be escaped in the value, 
+            //  otherwise it is used as a backreference
+            _value = value.replace(/&/g, '\\&'),
             // use commas as delims so that we don't need to escape value, which might be a URL
-            cmd = 'sed -i "s,' + _token + ',' + value + ',g" ' + filePath;
+            cmd = 'sed -i "s,' + _token + ',' + _value + ',g" ' + filePath;
         execSync(cmd);
     }
 

scripts/.xinitrc.tpl

@@ -6,4 +6,4 @@ xset s noblank
 
 unclutter -idle 0.1 &
 
-exec /usr/bin/chromium --noerrdialogs --kiosk --incognito $url
+exec /usr/bin/chromium --noerrdialogs --kiosk --incognito "$url"