10.0.46-2

pieroproietti · Oct 24, 2024 · 53d428c · 53d428c
1 parent 022b24a
commit 53d428c
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,9 @@ penguins-eggs
 # Changelog
 Versions are listed on reverse order, the first is the last one.
 
+## penguins-eggs-10.0.46-2
+* `bugfix`: the previus version `penguins-eggs-10.0.46-1` was working only on GUI using calamares, but generate an error - due a bug - on CLI systems or GUI system without calamares.
+
 ## penguins-eggs-10.0.46
 * `calamares`: now, using calamares, the default filesystem selected is the original filesystem of the parent system;
 * `calamares`: all modules in `/etc/calamares/modules` and `/etc/calamares/settings.conf` are reformatted, removing

diff --git a/conf/distros/rolling/calamares/modules/finished.yml b/conf/distros/rolling/calamares/modules/finished.yml
@@ -37,7 +37,7 @@ restartNowChecked: true
 # If the checkbox is shown, and the checkbox is checked, then when
 # Calamares exits from the finished-page it will run this command.
 # If not set, falls back to "shutdown -r now".
-restartNowCommand: {{restartNowCommand}}
+restartNowCommand: none
 
 # When the last page is (successfully) reached, send a DBus notification
 # to the desktop that the installation is done. This works only if the

diff --git a/src/classes/incubation/fisherman.ts b/src/classes/incubation/fisherman.ts
@@ -244,11 +244,11 @@ export default class Fisherman {
     this.buildModule(name)
     let file = this.installer.modules + name + '.conf'
     let fileContent = fs.readFileSync(file, 'utf8')
-    let yamlValues = yaml.load(fileContent) as ICalamaresDisplaymanager
-    yamlValues.displaymanagers = displaymanager()
+    let values = yaml.load(fileContent) as ICalamaresDisplaymanager
+    values.displaymanagers = displaymanager()
     let destContent = `# ${name}.conf, created by penguins-eggs ${pjson.version}\n`
     destContent += '---\n'
-    destContent += yaml.dump(yamlValues)
+    destContent += yaml.dump(values)
     fs.writeFileSync(file, destContent, 'utf8')
   }
 
@@ -260,11 +260,12 @@ export default class Fisherman {
     await this.buildModule(name)
     let file = this.installer.modules + name + '.conf'
     let fileContent = fs.readFileSync(file, 'utf8')
-    let yamlValues = yaml.load(fileContent) as ICalamaresFinished
-    yamlValues.restartNowCommand = 'reboot'
+    let values = yaml.load(fileContent) as ICalamaresFinished
+    values.restartNowCommand='reboot'
     let destContent = `# ${name}.conf, created by penguins-eggs ${pjson.version}\n`
     destContent += '---\n'
-    destContent += yaml.dump(yamlValues)
+    destContent += yaml.dump(values)
+    fs.writeFileSync(file, destContent, 'utf8')
   }
 
 

diff --git a/src/classes/incubation/incubator.ts b/src/classes/incubation/incubator.ts
@@ -83,7 +83,7 @@ export default class Incubator {
     const verbose = true
     const echo = Utils.setEcho(verbose)
 
-    Utils.warning(`creating ${installer().name} configuration files`)
+    Utils.warning(`creating ${installer().name} configuration files on ${installer().configRoot}`)
     this.createInstallerDirs()
     this.createBranding()