pulizia

Author: artisan

src/classes/ovary.d/make-efi.ts

@@ -56,7 +56,7 @@ export async function makeEfi(this: Ovary, theme = 'eggs') {
 
     if (!fs.existsSync(GAE)) {
         if (this.familyId === 'debian') {
-            console.log(`error: cannot find ${GAE}`)
+            Utils.error(`error: ${GAE} does not exist`)
             if (!Utils.isi686()) {
                 process.exit(1)
             }
@@ -193,7 +193,7 @@ export async function makeEfi(this: Ovary, theme = 'eggs') {
     }
 
     if (!fs.existsSync(splashSrc)) {
-        Utils.warning('Cannot find: ' + splashSrc)
+        Utils.warning(`warning: ${splashSrc} does not exists`)
         process.exit(1)
     }
     await exec(`cp ${splashSrc} ${splashDest}`, this.echo)
@@ -207,7 +207,7 @@ export async function makeEfi(this: Ovary, theme = 'eggs') {
     // copy theme
     const themeDest = `${isoDir}/boot/grub/theme.cfg`
     if (!fs.existsSync(themeSrc)) {
-        Utils.warning('Cannot find: ' + themeSrc)
+        Utils.error(`error: ${themeSrc} does not exist`)
         process.exit(1)
     }
     fs.copyFileSync(themeSrc, themeDest)
@@ -237,7 +237,7 @@ export async function makeEfi(this: Ovary, theme = 'eggs') {
     }
 
     if (!fs.existsSync(grubTemplate)) {
-        Utils.warning('Cannot find: ' + grubTemplate)
+        Utils.error(`error: ${grubTemplate} does not exist`)
         process.exit(1)
     }
 
@@ -321,7 +321,7 @@ function srcGAE(): string {
 function srcGAES(): string {
     let signedGrub = `/usr/lib/grub/${Utils.uefiFormat()}-signed/${nameGAES()}`;
     if (!fs.existsSync(signedGrub)) {
-        Utils.warning(`cannot find ${signedGrub}`)
+        Utils.warning(`warning: ${signedGrub} does not exist`)
     }
     return signedGrub
 }

src/classes/ovary.d/user-create-live.ts

@@ -125,7 +125,7 @@ export async function userCreateLive(this: Ovary) {
         }
         const o = yaml.load(fs.readFileSync(usersConf, 'utf8')) as IUserCalamares
         for (const group of o.defaultGroups) {
-            const groupExists = (await exec(`chroot ${this.settings.work_dir.merged} getent group ${group} ${this.toNull}`)).code === 0;
+            const groupExists = (await exec(`chroot ${this.settings.work_dir.merged} getent group ${group}`, {echo:false})).code === 0
             if (groupExists) {
                 cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} usermod -aG ${group} ${this.settings.config.user_opt} ${this.toNull}`, this.verbose))
             }

src/krill/classes/sequence.d/add_user.ts

@@ -78,7 +78,7 @@ export default async function addUser(this: Sequence, username = 'live', passwor
     }
     const o = yaml.load(fs.readFileSync(usersConf, 'utf8')) as IUserCalamares
     for (const group of o.defaultGroups) {
-      const groupExists = (await exec(`chroot ${this.installTarget} getent group ${group} ${this.toNull}`)).code === 0;
+      const groupExists = (await exec(`chroot ${this.settings.work_dir.merged} getent group ${group}`, {echo:false})).code === 0
       if (groupExists) {
         await exec(`chroot ${this.installTarget} usermod -aG ${group} ${username} ${this.toNull}`)
       } else {