Clone .xinitrc template before modifying

Author: jmwohl

.gitignore

@@ -5,4 +5,4 @@ artwork/
 npm-debug.log
 coverage/*
 player/*
-test/.xinitrc
+.xinitrc

extension.js

@@ -15,13 +15,15 @@ module.exports = new Extension({
         'display_name': 'Website',
         'download': false,
         'start_command': function(args, tokens) {
+            // 1. clone template .xinitrc
+            var filePath = _cloneTemplate(this.xinitrcTplPath);
             // 1. replace tokens in .xinitrc
-            _replaceTokens(this.xinitrcPath, tokens);
+            _replaceTokens(filePath, tokens);
             // 2. return xinit
-            return 'xinit ' + this.xinitrcPath;
+            return 'xinit ' + filePath;
         },
-        'end_command': 'sudo pkill -f chromium',
-        xinitrcPath: __dirname + '/scripts/.xinitrc'
+        'end_command': 'pkill -f X',
+        xinitrcTplPath: __dirname + '/scripts/.xinitrc.tpl'
     },
 });
 
@@ -33,11 +35,13 @@ module.exports = new Extension({
  * @return {string} The string with tokens replaced.
  */
 function _replaceTokens(filePath, tokens) {
+    console.log(_replaceTokens, filePath, tokens);
 
     function replace(token, value) {
-        // tokens start with a $, oops
-        token = '\\' + token;
-        var cmd = 'sed -i "s,' + token + ',' + value + ',g" ' + filePath;
+        // tokens start with a $ which needs to be escaped, oops
+        var _token = '\\' + token,
+            // use commas as delims so that we don't need to escape value, which might be a URL
+            cmd = 'sudo sed -i "s,' + _token + ',' + value + ',g" ' + filePath;
         execSync(cmd);
     }
 
@@ -47,3 +51,17 @@ function _replaceTokens(filePath, tokens) {
         replace(key, tokens[key]);
     }
 }
+
+/**
+ * Clone xinitrc
+ *
+ * @return {string} The string with tokens replaced.
+ */
+function _cloneTemplate(filePath) {
+    var newFilePath = filePath.replace('.tpl', ''),
+        cmd = 'cp -f ' + filePath + ' ' + newFilePath;
+
+    execSync(cmd);
+
+    return newFilePath;
+}

install.sh

@@ -23,8 +23,8 @@ if [ $os == "Linux" ]; then
     # same for any debian disto (untested), including rpi (tested)
     sudo apt-get install chromium
 
-    if [ $arq == "armv7l" ]; then
-        # on RaspberryPi
+    if [ $arq == "armv7l" ] || [ $arq == "armv6l" ]; then
+        # on RaspberryPi or other arm 6/7 device
 
         # ####
         #
@@ -62,12 +62,10 @@ if [ $os == "Linux" ]; then
         fi
 
         # TODO: update chromium window_placement settings
-        echo "armv7l"
 
 
     else
-        # Non-arm7 Debian...
-        echo "non armv7l"
+        # Non-arm Debian...
     fi
 
 elif [ $os == "Darwin" ]; then

package.json

@@ -38,7 +38,7 @@
   "license": "GPL-3.0",
   "devDependencies": {
     "coveralls": "^2.11.9",
-    "eslint": "^2.8.0",
+    "eslint": "^2.9.0",
     "istanbul": "^0.4.2",
     "mocha": "^2.3.4",
     "sinon": "^1.17.2"

scripts/.xinitrc scripts/.xinitrc.tplscripts/.xinitrc renamed to scripts/.xinitrc.tpl

@@ -11,10 +11,6 @@ describe('instantiation', function() {
 });
 
 describe('properties', function() {
-    before(function(done) {
-        exec('cp ' + __dirname + '/.xinitrc.spec ' + __dirname + '/.xinitrc', done);
-    });
-
     after(function(done) {
         exec('rm ' + __dirname + '/.xinitrc', done);
     });
@@ -48,7 +44,8 @@ describe('properties', function() {
             expected = 'exec /usr/bin/chromium --noerrdialogs --kiosk --incognito http://test.com';
 
         // use test .xinitrc
-        format.xinitrcPath = __dirname + '/.xinitrc';
+        format.xinitrcTplPath = __dirname + '/.xinitrc.tpl';
+        format.xinitrcFinalPath = format.xinitrcTplPath.replace('.tpl', '');
 
         // replace $url token with url string
         command = format.start_command({}, {
@@ -57,8 +54,10 @@ describe('properties', function() {
 
         assert(typeof command === 'string');
 
-        fs.readFile(format.xinitrcPath, 'utf8', function(err, data) {
-            if (err) throw err;
+        fs.readFile(format.xinitrcFinalPath, 'utf8', function(err, data) {
+            if (err) {
+                throw err;
+            }
             assert.equal(data, expected);
             done();
         });