fix(apps): fallback for Intel chip apps, dependencies of git

Avivbens · May 4, 2024 · 5676cb5 · 5676cb5
1 parent 07c5a79
commit 5676cb5
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 9 deletions.
diff --git a/src/commands/install/config/apps-groups/apps.ts b/src/commands/install/config/apps-groups/apps.ts
@@ -1,5 +1,5 @@
 import type { IAppSetup } from '@models/app-setup.model'
-import { BREW_CASK, BREW_INSTALL, OPEN_APP_STORE_APP_LINK, OPEN_BROWSER_LINK } from '../common-commands'
+import { BREW_CASK, BREW_INSTALL, BROW_CASK, OPEN_APP_STORE_APP_LINK, OPEN_BROWSER_LINK } from '../common-commands'
 
 export const APPS: Readonly<IAppSetup[]> = [
     {
@@ -147,12 +147,14 @@ export const APPS: Readonly<IAppSetup[]> = [
         group: 'apps',
         tags: ['personal'],
         commands: () => [BREW_CASK('whatsapp')],
+        fallbackCommands: () => [BROW_CASK('whatsapp')],
     },
     {
         name: 'Telegram Desktop',
         group: 'apps',
         tags: ['personal'],
         commands: () => [BREW_CASK('telegram-desktop')],
+        fallbackCommands: () => [BROW_CASK('telegram-desktop')],
     },
     {
         name: 'Dash',

diff --git a/src/commands/install/config/apps-groups/cli-apps.ts b/src/commands/install/config/apps-groups/cli-apps.ts
@@ -44,7 +44,7 @@ export const CLI_APPS: Readonly<IAppSetup[]> = [
     {
         name: 'google-cloud-sdk',
         group: 'cli-apps',
-        description: 'Integrate with Google Cloud Platform services, Python is required',
+        description: 'Integrate with Google Cloud Platform services (Python required)',
         tags: ['engineering'],
         commands: () => [BREW_CASK('google-cloud-sdk')],
         fallbackCommands: () => [BROW_CASK('google-cloud-sdk')],
@@ -53,7 +53,7 @@ export const CLI_APPS: Readonly<IAppSetup[]> = [
     {
         name: 'AWS CLI',
         group: 'cli-apps',
-        description: 'Official Amazon AWS command-line interface, Python is required',
+        description: 'Official Amazon AWS command-line interface (Python required)',
         tags: ['devops'],
         commands: () => [BREW_INSTALL('awscli')],
         deps: ['Python'],

diff --git a/src/commands/install/config/apps-groups/git.ts b/src/commands/install/config/apps-groups/git.ts
@@ -11,20 +11,22 @@ export const GIT_APPS: Readonly<IAppSetup[]> = [
     },
     {
         name: 'VSCode as rebase editor',
-        description: 'Apply rebase with VSCode UI editor',
+        description: 'Apply rebase with VSCode UI editor (Git required)',
         group: 'git',
         tags: ['super-user'],
         commands: () => [
             // avoid lock for other `git config` options
             'sleep 2',
             `git config --global core.editor "/Applications/Visual\\ Studio\\ Code.app/Contents/Resources/app/bin/code --wait"`,
         ],
+        deps: ['Git'],
     },
     {
         name: 'Enable ReReRe',
-        description: 'Enable reuse recorded resolution for merge conflicts',
+        description: 'Enable reuse recorded resolution for merge conflicts (Git required)',
         group: 'git',
         tags: ['super-user'],
         commands: () => [`git config --global rerere.enabled true`],
+        deps: ['Git'],
     },
 ] as const
diff --git a/src/commands/install/config/apps-groups/ides.ts b/src/commands/install/config/apps-groups/ides.ts
@@ -1,5 +1,5 @@
 import type { IAppSetup } from '@models/app-setup.model'
-import { BREW_CASK } from '../common-commands'
+import { BREW_CASK, BROW_CASK } from '../common-commands'
 
 export const IDES: Readonly<IAppSetup[]> = [
     {
@@ -13,14 +13,16 @@ export const IDES: Readonly<IAppSetup[]> = [
         group: 'IDEs',
         tags: ['web-engineering', 'node-engineering'],
         paid: true,
-        commands: () => [BREW_CASK('webstorm')],
+        commands: () => [BROW_CASK('webstorm')],
+        fallbackCommands: () => [BREW_CASK('webstorm')],
     },
     {
         name: 'Pycharm',
         group: 'IDEs',
         tags: ['python-engineering'],
         description: 'Python IDE',
         paid: true,
-        commands: () => [BREW_CASK('pycharm')],
+        commands: () => [BROW_CASK('pycharm')],
+        fallbackCommands: () => [BREW_CASK('pycharm')],
     },
 ]
diff --git a/src/commands/install/config/apps-groups/python.ts b/src/commands/install/config/apps-groups/python.ts
@@ -12,7 +12,7 @@ export const PYTHON: Readonly<IAppSetup[]> = [
     },
     {
         name: 'Python PIP',
-        description: 'Python package manager, Python is required',
+        description: 'Python package manager (Python required)',
         group: 'python',
         default: true,
         commands: () => [