mswin openssl - keep in Program Files

MSP-Greg · MSP-Greg · commit 4fc46d315213 · 2022-01-27T22:00:11.000-06:00
diff --git a/dist/index.js b/dist/index.js
@@ -638,8 +638,9 @@ const run = async () => {
       msSt = grpSt(`choco install ${choco}`)
       execSync(`choco install --no-progress ${choco}`)
       if (choco.includes('openssl')) {
-        fs.renameSync('C:\\Program Files\\OpenSSL-Win64', 'C:\\openssl-win')
-        core.exportVariable('SSL_DIR', '--with-openssl-dir=C:/openssl-win')
+        // fs.renameSync('C:\\Program Files\\OpenSSL-Win64', 'C:\\openssl-win')
+        // core.exportVariable('SSL_DIR', '--with-openssl-dir=C:/openssl-win')
+        core.exportVariable('SSL_DIR', '--with-openssl-dir="C:/Program Files/OpenSSL-Win64"')
       }
       grpEnd(msSt)
     }
diff --git a/dist/package.json b/dist/package.json
@@ -1,6 +1,6 @@
 {
   "name": "setup-ruby-pkgs",
-  "version": "1.30.0",
+  "version": "1.30.1",
   "description": "Install packages and update builds tools for Ruby",
   "main": "index.js",
   "scripts": {
diff --git a/mswin.js b/mswin.js
@@ -43,8 +43,9 @@ export const run = async () => {
       msSt = grpSt(`choco install ${choco}`)
       execSync(`choco install --no-progress ${choco}`)
       if (choco.includes('openssl')) {
-        fs.renameSync('C:\\Program Files\\OpenSSL-Win64', 'C:\\openssl-win')
-        core.exportVariable('SSL_DIR', '--with-openssl-dir=C:/openssl-win')
+        // fs.renameSync('C:\\Program Files\\OpenSSL-Win64', 'C:\\openssl-win')
+        // core.exportVariable('SSL_DIR', '--with-openssl-dir=C:/openssl-win')
+        core.exportVariable('SSL_DIR', '--with-openssl-dir="C:/Program Files/OpenSSL-Win64"')
       }
       grpEnd(msSt)
     }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "setup-ruby-pkgs",
-  "version": "1.30.0",
+  "version": "1.30.1",
   "description": "Install packages and update builds tools for Ruby",
   "main": "index.js",
   "scripts": {

Original file line number	Diff line number	Diff line change
`@@ -638,8 +638,9 @@ const run = async () => {`
`638`	`638`	msSt = grpSt(`choco install ${choco}`)
`639`	`639`	execSync(`choco install --no-progress ${choco}`)
`640`	`640`	`if (choco.includes('openssl')) {`
`641`		`- fs.renameSync('C:\\Program Files\\OpenSSL-Win64', 'C:\\openssl-win')`
`642`		`- core.exportVariable('SSL_DIR', '--with-openssl-dir=C:/openssl-win')`
	`641`	`+ // fs.renameSync('C:\\Program Files\\OpenSSL-Win64', 'C:\\openssl-win')`
	`642`	`+ // core.exportVariable('SSL_DIR', '--with-openssl-dir=C:/openssl-win')`
	`643`	`+ core.exportVariable('SSL_DIR', '--with-openssl-dir="C:/Program Files/OpenSSL-Win64"')`
`643`	`644`	`}`
`644`	`645`	`grpEnd(msSt)`
`645`	`646`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "setup-ruby-pkgs",`
`3`		`- "version": "1.30.0",`
	`3`	`+ "version": "1.30.1",`
`4`	`4`	`"description": "Install packages and update builds tools for Ruby",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -43,8 +43,9 @@ export const run = async () => {`
`43`	`43`	msSt = grpSt(`choco install ${choco}`)
`44`	`44`	execSync(`choco install --no-progress ${choco}`)
`45`	`45`	`if (choco.includes('openssl')) {`
`46`		`- fs.renameSync('C:\\Program Files\\OpenSSL-Win64', 'C:\\openssl-win')`
`47`		`- core.exportVariable('SSL_DIR', '--with-openssl-dir=C:/openssl-win')`
	`46`	`+ // fs.renameSync('C:\\Program Files\\OpenSSL-Win64', 'C:\\openssl-win')`
	`47`	`+ // core.exportVariable('SSL_DIR', '--with-openssl-dir=C:/openssl-win')`
	`48`	`+ core.exportVariable('SSL_DIR', '--with-openssl-dir="C:/Program Files/OpenSSL-Win64"')`
`48`	`49`	`}`
`49`	`50`	`grpEnd(msSt)`
`50`	`51`	`}`