feat: install snapd

AppOutlet · May 4, 2021 · 8447fce · 8447fce
1 parent eef1bfe
commit 8447fce
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 21 deletions.
diff --git a/src/app/service/setup/setup.service.ts b/src/app/service/setup/setup.service.ts
@@ -6,24 +6,20 @@ export class SetupService {
     constructor(private processService: ProcessService) {}
 
     installSnapd(): Promise<string> {
-        return this.processService.executeCommand('pkexec apt install snapd');
+        return this.processService.executeCommand(
+            'pkexec apt-get install snapd -y',
+        );
     }
 
     installFlatpak(): Promise<string> {
-        return this.processService.executeCommand('pkexec apt install snapd');
+        return this.processService.executeCommand('pkexec apt install flatpak');
     }
 
-    checkIfSnapdIsInstalled(): Promise<void> {
-        return this.processService.executeCommand('snap version').then(() => {
-            return;
-        });
+    checkIfSnapdIsInstalled(): Promise<string> {
+        return this.processService.executeCommand('snap version');
     }
 
-    checkIfFlatpakIsInstalled(): Promise<void> {
-        return this.processService
-            .executeCommand('flatpak --version')
-            .then(() => {
-                return;
-            });
+    checkIfFlatpakIsInstalled(): Promise<string> {
+        return this.processService.executeCommand('flatpak --version');
     }
 }
diff --git a/src/app/ui/components/setup-item-card/setup-item-card.component.html b/src/app/ui/components/setup-item-card/setup-item-card.component.html
@@ -10,6 +10,7 @@
                     status="primary"
                     size="small"
                     *ngIf="status === 'not_installed'"
+                    (click)="onInstallClicked()"
                 >
                     {{ installButtonText }}
                 </button>
@@ -19,6 +20,7 @@
                     status="danger"
                     size="small"
                     *ngIf="status === 'error'"
+                    (click)="onInstallClicked()"
                 >
                     {{ tryAgainButtonText || 'GENERAL.TRY_AGAIN' | translate }}
                 </button>

diff --git a/src/app/ui/components/setup-item-card/setup-item-card.component.ts b/src/app/ui/components/setup-item-card/setup-item-card.component.ts
@@ -12,13 +12,8 @@ export class SetupItemCardComponent {
     @Input() tryAgainButtonText?: string;
     @Input() status = CardStatus.LOADING;
     @Output() installClicked = new EventEmitter<void>();
-    @Output() tryAgainClicked = new EventEmitter<void>();
 
     onInstallClicked(): void {
         this.installClicked.emit();
     }
-
-    onTryAgainClicked(): void {
-        this.tryAgainClicked.emit();
-    }
 }
diff --git a/src/app/ui/pages/initial-setup/initial-setup.component.html b/src/app/ui/pages/initial-setup/initial-setup.component.html
@@ -20,7 +20,6 @@ <h4 class="greetings">
                             'PAGES.INITIAL_SETUP.INSTALL_SNAPD' | translate
                         }}"
                         (installClicked)="installSnapd()"
-                        (tryAgainClicked)="installSnapd()"
                     ></app-setup-item-card>
                     <app-setup-item-card
                         [status]="flatpakStatus"
@@ -29,7 +28,6 @@ <h4 class="greetings">
                             'PAGES.INITIAL_SETUP.INSTALL_FLATPAK' | translate
                         }}"
                         (installClicked)="installFlatpak()"
-                        (tryAgainClicked)="installFlatpak()"
                     ></app-setup-item-card>
                 </nb-card-body>
                 <nb-card-footer>

diff --git a/src/app/ui/pages/initial-setup/initial-setup.component.ts b/src/app/ui/pages/initial-setup/initial-setup.component.ts
@@ -47,10 +47,28 @@ export class InitialSetupComponent implements OnInit {
     }
 
     installSnapd(): void {
-        this.setupService.installSnapd().then();
+        this.snapdStatus = CardStatus.INSTALLING;
+        this.setupService
+            .installSnapd()
+            .then((result) => {
+                console.log(result);
+                this.snapdStatus = CardStatus.INSTALLED;
+            })
+            .catch((err) => {
+                console.error(err);
+                this.snapdStatus = CardStatus.ERROR;
+            });
     }
 
     installFlatpak(): void {
-        this.setupService.installFlatpak().then();
+        this.flatpakStatus = CardStatus.INSTALLING;
+        this.setupService
+            .installFlatpak()
+            .then(() => {
+                this.flatpakStatus = CardStatus.INSTALLED;
+            })
+            .catch(() => {
+                this.flatpakStatus = CardStatus.ERROR;
+            });
     }
 }