mingw.js - fix openssl 1.0.2 install

MSP-Greg · MSP-Greg · commit a0be2bda4dab · 2020-05-10T12:36:37.000-05:00
diff --git a/dist/index.js b/dist/index.js
@@ -607,11 +607,11 @@ const openssl = async () => {
   })
 
   if (ruby.abiVers === '2.4.0') {
-    const uri = `https://dl.bintray.com/larskanis/rubyinstaller2-packages/${pre.trim()}openssl-1.0.2.u-1-any.pkg.tar.zst`
-    const fn = `${dlPath}\\ri2.tar.zst`
+    let uri = `https://dl.bintray.com/larskanis/rubyinstaller2-packages/${pre.trim()}openssl-1.0.2.u-1-any.pkg.tar.zst`
+    let fn = `${dlPath}\\ri2.tar.zst`
     msSt = grpSt('install 2.4 OpenSSL')
     await download(uri, fn)
-    execSync(`pacman.exe -R --noconfirm --noprogressbar ${pre.trim()}openssl`)
+    await download(`${uri}.sig`, `${fn}.sig`)
     execSync(`pacman.exe -Udd --noconfirm --noprogressbar ${fn}`)
     grpEnd(msSt)
     mingw = mingw.replace(/\bopenssl\b/gi, '').trim()
diff --git a/dist/package.json b/dist/package.json
@@ -1,6 +1,6 @@
 {
   "name": "setup-ruby-pkgs",
-  "version": "1.7.0",
+  "version": "1.8.0",
   "description": "Install packages and update builds tools for Ruby",
   "main": "index.js",
   "scripts": {
diff --git a/mingw.js b/mingw.js
@@ -76,11 +76,11 @@ const openssl = async () => {
   })
 
   if (ruby.abiVers === '2.4.0') {
-    const uri = `https://dl.bintray.com/larskanis/rubyinstaller2-packages/${pre.trim()}openssl-1.0.2.u-1-any.pkg.tar.zst`
-    const fn = `${dlPath}\\ri2.tar.zst`
+    let uri = `https://dl.bintray.com/larskanis/rubyinstaller2-packages/${pre.trim()}openssl-1.0.2.u-1-any.pkg.tar.zst`
+    let fn = `${dlPath}\\ri2.tar.zst`
     msSt = grpSt('install 2.4 OpenSSL')
     await download(uri, fn)
-    execSync(`pacman.exe -R --noconfirm --noprogressbar ${pre.trim()}openssl`)
+    await download(`${uri}.sig`, `${fn}.sig`)
     execSync(`pacman.exe -Udd --noconfirm --noprogressbar ${fn}`)
     grpEnd(msSt)
     mingw = mingw.replace(/\bopenssl\b/gi, '').trim()
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "setup-ruby-pkgs",
-  "version": "1.7.0",
+  "version": "1.8.0",
   "description": "Install packages and update builds tools for Ruby",
   "main": "index.js",
   "scripts": {

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.7.0",`
	`3`	`+ "version": "1.8.0",`
`4`	`4`	`"description": "Install packages and update builds tools for Ruby",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"scripts": {`