Labwc support, improved non-pi user support (#118)

* Added autostart support for Wayland with Labwc.
* Fix problems starting service under any admin user other than `pi`.

Author: kshetline

.idea/dictionaries/default_user.xml

@@ -1,3 +1,8 @@
+## 3.7.2
+
+* Added autostart support for Wayland with Labwc.
+* Fix problems starting service under any admin user other than `pi`.
+
 ## 3.7.1-do
 
 * Better documentation on installation of the Adafruit GPS HAT.

CHANGELOG.md

@@ -396,7 +396,7 @@ For reference, here’s a breakdown of the steps performed by a full installatio
 1. The commands `sudo update-rc.d weatherService defaults` and `sudo systemctl enable weatherService` are performed to establish and enable the service.
 1. An `autostart` file is created in `~/.config/lxsession/LXDE-pi/` (no `‑pi` on the end for Debian), or the existing `autostart` file is modified, to run the following script...
 1. The included file `autostart_extra.sh` is also copied to the above directory. This includes code to make sure Chromium doesn’t launch complaining it was shut down improperly, which could interfere with an otherwise smooth automatic start-up. The code then makes sure the clock server is running before launching your chosen web browser with the clock application.
-1. For Raspbian Bookworm or later, `~/.config/wayfire.ini` is also modified to run `autostart_extra.sh`.
+1. For Raspbian Bookworm or later, `~/.config/wayfire.ini` and `~/.config/labwc/autostart` are also modified to run `autostart_extra.sh`.
 1. The options `‑‑launch` or `‑‑reboot` are performed if specified.
 
 ### Screen Resolution

README.md

@@ -109,8 +109,7 @@ const cpuPath2 = '/sys/firmware/devicetree/base/model';
 const settingsPath = '/etc/default/weatherService';
 const rpiSetupStuff = path.join(__dirname, 'raspberry_pi_setup');
 const serviceSrc = rpiSetupStuff + '/weatherService';
-const serviceDst = '/etc/init.d/.';
-const serviceDstFull = '/etc/init.d/weatherService';
+const serviceDst = '/etc/init.d/weatherService';
 const fontSrc = rpiSetupStuff + '/fonts/';
 const fontDst = '/usr/local/share/fonts/';
 let chromium = 'chromium';
@@ -693,7 +692,7 @@ async function checkForGps(): Promise<void> {
       console.log(chalkUp('  [pb]• Install [w]ntpd[/w] and [w]ntpq[/w]'));
 
     if (!hasPpsTools)
-      console.log(chalkUp('  [pb]• Install [w]ppstest[/w]'));
+      console.log(chalkUp('  [pb]• Install [w]pps-tools[/w]'));
   }
   else
     console.log('GPS time and location services found ' + chalk.green(CHECK_MARK));
@@ -1107,7 +1106,7 @@ async function doServerBuild(): Promise<void> {
   if (doAcu || doDht) {
     showStep();
 
-    const args = ['i', '-P', 'rpi-acu-rite-temperature@3', 'node-dht-sensor-rp5@0'];
+    const args = ['i', '-P', 'rpi-acu-rite-temperature@3', 'node-dht-sensor'];
 
     if (isRaspberryPi5OrLater)
       args.push('--use_libgpiod=true');
@@ -1145,8 +1144,11 @@ async function doServiceDeployment(): Promise<void> {
 
   showStep();
   write('Create or redeploy weatherService' + trailingSpace);
-  await monitorProcess(spawn('cp', [serviceSrc, serviceDst], { shell: true }), spin, ErrorMode.ANY_ERROR);
-  await monitorProcess(spawn('chmod', ['+x', serviceDstFull], { shell: true }), spin, ErrorMode.ANY_ERROR);
+
+  const serviceScript = fs.readFileSync(serviceSrc).toString().replace(/\/pi\//g, `/${user}/`);
+
+  fs.writeFileSync(serviceDst, serviceScript);
+  await monitorProcess(spawn('chmod', ['+x', serviceDst], { shell: true }), spin, ErrorMode.ANY_ERROR);
 
   const settingsText =
     `# If you edit AWC_PORT below, be sure to update\n#   ${userHome}/${autostartDst}/autostart` +
@@ -1172,7 +1174,8 @@ async function doServiceDeployment(): Promise<void> {
 
   autoScript = autoScript.replace('echo #launch-here', launchCmd)
     .replace(/:8080\b/, ':' + settings.AWC_PORT)
-    .replace('the-browser', doFirefox ? 'firefox' : chromium);
+    .replace('the-browser', doFirefox ? 'firefox' : chromium)
+    .replace(/\/pi\//g, `/${user}/`);
 
   fs.writeFileSync(path.join(autostartDir, autostartScriptFile), autoScript);
 
@@ -1182,6 +1185,7 @@ async function doServiceDeployment(): Promise<void> {
   let update = false;
   let found = false;
 
+  // Autostart setup for X11
   try {
     lines = asLines(fs.readFileSync(autostartPath).toString()).filter(line => !!line.trim());
   }
@@ -1216,36 +1220,68 @@ async function doServiceDeployment(): Promise<void> {
   if (update)
     fs.writeFileSync(autostartPath, lines.join('\n') + '\n');
 
-  // Extra autostart setup for Wayfire
-  if (existsSync(wayfireIniPath)) {
-    try {
+  // Autostart setup for Wayland/Wayfire
+  try {
+    if (!existsSync(wayfireIniPath)) {
+      fs.mkdirSync(path.dirname(wayfireIniPath), { recursive:  true });
+      lines = [];
+    }
+    else
       lines = asLines(fs.readFileSync(wayfireIniPath).toString()).filter(line => !!line.trimEnd());
 
-      let autoIndex = lines.findIndex(l => l.startsWith('[autostart]'));
-
-      if (autoIndex < 0) {
-        lines.push('');
-        lines.push('[autostart]');
-        autoIndex = lines.length;
-      }
-      else
-        while (lines[++autoIndex] && !/^clock[12] = /.test(lines[autoIndex])) {}
+    let autoIndex = lines.findIndex(l => l.startsWith('[autostart]'));
 
-      // Prevent duplicate entries, remove old entries
-      lines = lines.filter((l, i) => i < autoIndex || !/^clock[12] = /.test(l));
-      lines.splice(autoIndex, 0, 'clock1 = ' + autostartEntry);
-      fs.writeFileSync(wayfireIniPath, lines.join('\n') + '\n');
+    if (autoIndex < 0) {
+      lines.push('');
+      lines.push('[autostart]');
+      autoIndex = lines.length;
     }
-    catch (e) {
-      console.error(chalk.redBright('Error: failed to update .config/wayfire.ini to autostart AW-Clock'));
-      console.error(chalk.redBright('   ' + e.message));
+    else
+      while (lines[++autoIndex] && !/^((\s*\[)|(clock[12] = ))/.test(lines[autoIndex])) {}
+
+    // Prevent duplicate entries, remove old entries
+    lines = lines.filter((l, i) => i < autoIndex || !/^clock[12] = /.test(l));
+    lines.splice(autoIndex, 0, 'clock1 = ' + autostartEntry);
+    fs.writeFileSync(wayfireIniPath, lines.join('\n') + '\n');
+  }
+  catch (e) {
+    console.error(chalk.redBright('Error: failed to update .config/wayfire.ini to autostart AW-Clock'));
+    console.error(chalk.redBright('   ' + e.message));
+  }
+
+  // Autostart setup for Wayland/Labwc
+  const labwcAutostartPath = path.join(userHome, '.config/labwc/autostart');
+
+  try {
+    if (!existsSync(labwcAutostartPath)) {
+      fs.mkdirSync(path.dirname(labwcAutostartPath), { recursive:  true });
+      lines = [];
     }
+    else
+      lines = asLines(fs.readFileSync(labwcAutostartPath).toString()).filter(line => !!line.trimEnd());
+
+    const autoIndex = lines.findIndex(l => /\bautostart_extra.sh\b/.test(l));
+
+    if (autoIndex < 0)
+      lines.push(autostartEntry);
+    else
+      lines[autoIndex] = autostartEntry;
+
+    fs.writeFileSync(labwcAutostartPath, lines.join('\n') + '\n');
+  }
+  catch (e) {
+    console.error(chalk.redBright('Error: failed to update .config/labwc/autostart to autostart AW-Clock'));
+    console.error(chalk.redBright('   ' + e.message));
   }
 
   await monitorProcess(spawn('chown', 0, [sudoUser, autostartDir + '/autostart*'],
     { shell: true }), spin, ErrorMode.ANY_ERROR);
   await monitorProcess(spawn('chmod', uid, ['+x', autostartDir + '/autostart*'],
     { shell: true }), spin, ErrorMode.ANY_ERROR);
+  await monitorProcess(spawn('chown', 0, [sudoUser, wayfireIniPath],
+    { shell: true }), spin, ErrorMode.ANY_ERROR);
+  await monitorProcess(spawn('chown', 0, [sudoUser, labwcAutostartPath],
+    { shell: true }), spin, ErrorMode.ANY_ERROR);
 
   if (noStop)
     console.log(backspace + trailingSpace + '\n\nReboot to complete set-up.');

build.js

@@ -73,22 +73,23 @@ install_nvm() {
 
 # Sync version changes with build.ts
 sadVersion=10
-minVersion=14
-maxVersion=18
-absMaxVersion=20
+minAptGetVersion=18
+minVersion=18
+maxVersion=20
+absMaxVersion=24
 free=$(free || echo "4194304")
 pattern='([0-9]+)'
 [[ $free =~ $pattern ]]
 free="${BASH_REMATCH[1]}"
 
 # If less than 2G RAM, go with Node 12 instead
-if (( free < 1500000 ));then
+if (( free < 1500000 )); then
   minVersion=12
   maxVersion=12
   absMaxVersion=12
-elif (( free > 8000000 ));then
-  minVersion=14
-  maxVersion=22
+elif (( free > 8000000 )); then
+  minVersion=20
+  maxVersion=24
   absMaxVersion=999
 fi
 
@@ -111,7 +112,7 @@ if [ "$version" -ne "$maxVersion" ] && [ -s "$NVM_DIR/nvm.sh" ]; then
   version="$(current_node_version)"
 fi
 
-if (( version < minVersion )); then
+if ( (( version < minVersion )) && (( minVersion >= minAptGetVersion )) ); then
   echo "Installing Node.js. This could take several minutes..."
   sudo apt-get update
   curl -sL https://deb.nodesource.com/setup_"$minVersion".x | sudo bash -
@@ -143,7 +144,7 @@ if (( version < 0 )); then
     rm -rf "$NVM_DIR"
   fi
 
-  [ -d "$HOME/.nvm" ] rm -rf "$HOME/.nvm"
+  [ -d "$HOME/.nvm" ] && rm -rf "$HOME/.nvm"
   export PATH="$originalPath"
   version="$(current_node_version)"
 

build.ts

@@ -1,6 +1,6 @@
 {
   "name": "aw-clock",
-  "version": "3.7.1",
+  "version": "3.7.2",
   "license": "MIT",
   "author": "Kerry Shetline <kerry@shetline.com>",
   "scripts": {

build_node_check.sh

@@ -1,6 +1,6 @@
 {
   "name": "aw-clock-sass",
-  "version": "3.7.1",
+  "version": "3.7.2",
   "description": "SASS builder for aw-clock",
   "keywords": [
     "sass"