revert and add some logging

XRTK · Jul 17, 2024 · d68c56e · d68c56e
1 parent b1fbac5
commit d68c56e
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 14 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -28088,8 +28088,8 @@ const main = async () => {
         core.debug(`buildTargets: ${buildTargets}`);
 
         if (!buildTargets) {
-           modules = core.getInput('modules');
-           var modules = modules.replace(/,/g, '').split(/\s+/);
+            modules = core.getInput('modules');
+            var modules = modules.replace(/,/g, '').split(/\s+/);
         } else {
             const osType = os.type();
             var moduleMap = undefined;
@@ -28171,7 +28171,11 @@ const main = async () => {
         var install = __nccwpck_require__.ab + "unity-install.ps1";
         var exitCode = 0;
 
-        exitCode = await exec.exec(`"${pwsh}" -Command`, `${install} ${args}`);
+        try {
+            exitCode = await exec.exec(`"${pwsh}" -Command`, `${install} ${args}`);
+        } catch (error) {
+            core.error(error);
+        }
 
         if (exitCode != 0) {
             throw Error(`Unity Installation Failed! exitCode: ${exitCode}`)
@@ -28199,7 +28203,7 @@ const findFile = async (dir, filePath) => {
     }
 
     if (matchedFiles.length == 0) {
-        for(const subDir of directories) {
+        for (const subDir of directories) {
             const nestedMatches = await findFile(subDir, filePath);
 
             for (const nestedMatch of nestedMatches) {

diff --git a/dist/unity-install.ps1 b/dist/unity-install.ps1
@@ -158,6 +158,8 @@ if ( -not (Test-Path -Path "$hubPath") ) {
             exit 1
         }
 
+        Write-Host "Unity Hub installed at $hubPath"
+
         sudo chmod -R 777 $hubPath
         sudo mkdir -p "/Library/Application Support/Unity"
         sudo chmod -R 777 "/Library/Application Support/Unity"
@@ -311,9 +313,9 @@ foreach ($module in (Get-Content -Raw -Path $modulesPath | ConvertFrom-Json -AsH
 $envEditorPath = $env:UNITY_EDITOR_PATH
 
 # if mac or linux update permissons for editor installation
-if ($IsMacOS -or $IsLinux) {
-    sudo chmod -R 777 $editorRootPath
-}
+# if ($IsMacOS -or $IsLinux) {
+#     sudo chmod -R 777 $editorRootPath
+# }
 
 if ([String]::IsNullOrEmpty($envEditorPath)) {
     Write-Host ""

diff --git a/src/index.js b/src/index.js
@@ -27,8 +27,8 @@ const main = async () => {
         core.debug(`buildTargets: ${buildTargets}`);
 
         if (!buildTargets) {
-           modules = core.getInput('modules');
-           var modules = modules.replace(/,/g, '').split(/\s+/);
+            modules = core.getInput('modules');
+            var modules = modules.replace(/,/g, '').split(/\s+/);
         } else {
             const osType = os.type();
             var moduleMap = undefined;
@@ -110,7 +110,11 @@ const main = async () => {
         var install = path.resolve(__dirname, 'unity-install.ps1');
         var exitCode = 0;
 
-        exitCode = await exec.exec(`"${pwsh}" -Command`, `${install} ${args}`);
+        try {
+            exitCode = await exec.exec(`"${pwsh}" -Command`, `${install} ${args}`);
+        } catch (error) {
+            core.error(error);
+        }
 
         if (exitCode != 0) {
             throw Error(`Unity Installation Failed! exitCode: ${exitCode}`)
@@ -138,7 +142,7 @@ const findFile = async (dir, filePath) => {
     }
 
     if (matchedFiles.length == 0) {
-        for(const subDir of directories) {
+        for (const subDir of directories) {
             const nestedMatches = await findFile(subDir, filePath);
 
             for (const nestedMatch of nestedMatches) {

diff --git a/src/unity-install.ps1 b/src/unity-install.ps1
@@ -158,6 +158,8 @@ if ( -not (Test-Path -Path "$hubPath") ) {
             exit 1
         }
 
+        Write-Host "Unity Hub installed at $hubPath"
+
         sudo chmod -R 777 $hubPath
         sudo mkdir -p "/Library/Application Support/Unity"
         sudo chmod -R 777 "/Library/Application Support/Unity"
@@ -311,9 +313,9 @@ foreach ($module in (Get-Content -Raw -Path $modulesPath | ConvertFrom-Json -AsH
 $envEditorPath = $env:UNITY_EDITOR_PATH
 
 # if mac or linux update permissons for editor installation
-if ($IsMacOS -or $IsLinux) {
-    sudo chmod -R 777 $editorRootPath
-}
+# if ($IsMacOS -or $IsLinux) {
+#     sudo chmod -R 777 $editorRootPath
+# }
 
 if ([String]::IsNullOrEmpty($envEditorPath)) {
     Write-Host ""