fix(variables): put variables in 'path' property

Atlas-OS · Sep 20, 2023 · a185fd4 · a185fd4
1 parent 47b710f
commit a185fd4
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 18 deletions.
diff --git a/src/playbook/Configuration/atlas/components.yml b/src/playbook/Configuration/atlas/components.yml
@@ -6,13 +6,16 @@ actions:
     # Windows Defender
   - !writeStatus: {status: 'Disabling Windows Defender', option: 'defender-disable'}
   - !run:
-    exe: '%windir%\AtlasDesktop\7. Security\Defender\Toggle Defender.cmd'
+    exe: 'Toggle Defender.cmd'
+    path: '%windir%\AtlasDesktop\7. Security\Defender'
     args: '-Disable'
     wait: true
     option: 'defender-disable'
     # Remove Security Center startup item
   - !registryValue: {path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Run', value: 'SecurityHealth', operation: delete}
+
     # Causes slow app loading issues, and sends data to Microsoft
+    # Disable Smart App Control
   - !registryValue:
     path: 'HKLM\SYSTEM\CurrentControlSet\Control\CI\Policy'
     value: 'VerifiedAndReputablePolicyState'
@@ -21,9 +24,8 @@ actions:
 
     # Microsoft Edge
   - !writeStatus: {status: 'Removing Microsoft Edge', option: 'uninstall-edge'}
-  - !run:
-    exe: 'NSudoLC.exe'
-    args: '-U:E -UseCurrentConsole -Wait powershell.exe -NoP -EP Unrestricted -File "$env:windir\AtlasDesktop\1. Software\Remove Edge.ps1" -AMEWizard'
+  - !cmd:
+    command: 'NSudoLC.exe -U:E -UseCurrentConsole -Wait powershell.exe -NoP -EP Unrestricted -File "%windir%\AtlasDesktop\1. Software\Remove Edge.ps1" -AMEWizard'
     wait: true
     exeDir: true
     option: 'uninstall-edge'
@@ -40,12 +42,14 @@ actions:
   - !writeStatus: {status: 'Removing components'}
     # NoTelemetry Package
   - !run:
-    exe: '%windir%\AtlasModules\Scripts\online-sxs.cmd'
+    exe: 'online-sxs.cmd'
+    path: '%windir%\AtlasModules\Scripts'
     args: '"%windir%\AtlasModules\Packages\Z-Atlas-NoTelemetry-Package31bf3856ad364e35amd643.0.0.0.cab"'
     wait: true
     # Misc Package
   - !run:
-    exe: '%windir%\AtlasModules\Scripts\online-sxs.cmd'
+    exe: 'online-sxs.cmd'
+    path: '%windir%\AtlasModules\Scripts'
     args: '"%windir%\AtlasModules\Packages\Z-Atlas-Misc-Remover-Package31bf3856ad364e35amd643.0.0.0.cab"'
     wait: true
 
@@ -62,4 +66,4 @@ actions:
     # Converts all Microsoft user accounts to local accounts
   - !run:
     exeDir: true
-    exe: 'CONVERTUSERS.cmd'
+    exe: 'CONVERTUSERS.cmd'
diff --git a/src/playbook/Configuration/atlas/services.yml b/src/playbook/Configuration/atlas/services.yml
@@ -6,20 +6,21 @@ actions:
   - !writeStatus: {status: 'Configuring services'}
 
   # Backup default Windows serivces & drivers
-  - !run:
-    exe: 'powershell.exe'
-    args: '-NoP -EP Unrestricted -File "BACKUP.ps1" "$env:windir\AtlasModules\Other\atlasServices.reg"'
+  - !cmd:
+    command: 'powershell -NoP -EP Unrestricted -File "BACKUP.ps1" "%windir%\AtlasModules\Other\atlasServices.reg"'
     wait: true
     exeDir: true
 
   # ------------------------ Services ------------------------
 
   - !run:
-    exe: '%windir%\AtlasDesktop\3. Configuration\Bluetooth\Disable Bluetooth.cmd'
+    exe: 'Disable Bluetooth.cmd'
+    path: '%windir%\AtlasDesktop\3. Configuration\Bluetooth'
     args: '/silent'
     option: 'disable-bluetooth'
   - !run:
-    exe: '%windir%\AtlasDesktop\3. Configuration\Printing\Disable Printing (default).cmd'
+    exe: 'Disable Printing (default).cmd'
+    path: '%windir%\AtlasDesktop\3. Configuration\Printing'
     args: '/silent'
 
   - !service: {name: 'diagnosticshub.standardcollector.service', operation: change, startup: 4}

diff --git a/src/playbook/Configuration/atlas/start.yml b/src/playbook/Configuration/atlas/start.yml
@@ -419,3 +419,4 @@ actions:
     path: '%windir%\SoftwareDistribution'
     weight: 20
     ignoreErrors: true
+
diff --git a/src/playbook/Configuration/tweaks/scripts/script-backup2.yml b/src/playbook/Configuration/tweaks/scripts/script-backup2.yml
@@ -3,8 +3,7 @@ title: Backup Atlas Services and Drivers
 description: Backs up default Atlas services and drivers, after all the tweaks are finished
 privilege: TrustedInstaller
 actions:
-  - !run:
-    exe: 'powershell.exe'
-    args: '-NoP -EP Unrestricted -File "BACKUP.ps1" "$env:windir\AtlasModules\Other\winServices.reg"'
+  - !cmd:
+    command: 'powershell -NoP -EP Unrestricted -File "BACKUP.ps1" "%windir%\AtlasModules\Other\winServices.reg"'
     wait: true
     exeDir: true
diff --git a/src/playbook/Configuration/tweaks/scripts/script-mitigations.yml b/src/playbook/Configuration/tweaks/scripts/script-mitigations.yml
@@ -4,7 +4,8 @@ description: Disables mitigations in Windows dependant on the user's options
 privilege: TrustedInstaller
 actions:
   - !run:
-    exe: '%windir%\AtlasDesktop\7. Security\Mitigations\Disable All Mitigations.cmd'
+    exe: 'Disable All Mitigations.cmd'
+    path: '%windir%\AtlasDesktop\7. Security\Mitigations'
     args: '/silent'
     wait: true
     option: 'mitigations-disable'
diff --git a/src/playbook/Configuration/tweaks/scripts/script-power.yml b/src/playbook/Configuration/tweaks/scripts/script-power.yml
@@ -5,14 +5,16 @@ privilege: TrustedInstaller
 actions:
     # Disable Power Saving features
   - !run:
-    exe: '%windir%\AtlasDesktop\3. Configuration\Power\Power Saving\Disable Power Saving.cmd'
+    exe: 'Disable Power Saving.cmd'
+    path: '%windir%\AtlasDesktop\3. Configuration\Power\Power Saving'
     args: '/setup'
     weight: 20
     option: 'disable-power-saving'
 
     # Disable Hibernation & Fast Startup
     # Disabling makes NTFS accessible outside of Windows
   - !run:
-    exe: '%windir%\AtlasDesktop\3. Configuration\Power\Hibernation\Disable Hibernation (default).cmd'
+    exe: 'Disable Hibernation (default).cmd'
+    path: '%windir%\AtlasDesktop\3. Configuration\Power\Hibernation'
     args: '/setup'
     weight: 20
Original file line number	Diff line number	Diff line change
Expand Up		@@ -419,3 +419,4 @@ actions:
		path: '%windir%\SoftwareDistribution'
		weight: 20
		ignoreErrors: true