Improve logging (#4)

* Improve logging to ensure PATH is updated correctly
seanmiddleditch · Aug 15, 2020 · e7bad1a · e7bad1a
1 parent 6ae37b4
commit e7bad1a
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 20 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -259,7 +259,6 @@ try {
     if (error) throw error
 
     const url = new URL(`https://github.com/ninja-build/ninja/releases/download/v${version}/ninja-${platform}.zip`)
-    //const url = new URL('https://google.com')
     console.log(`downloading ${url}`)
 
     const request = https.get(url, {followAllRedirects: true}, result => {
@@ -271,35 +270,41 @@ try {
             const length = data.reduce((len, chunk) => len + chunk.length, 0)
             const buffer = Buffer.alloc(length)
 
-            console.log(`received file, size ${buffer.length}`)
-
             data.reduce((pos, chunk) => {
                 chunk.copy(buffer, pos)
                 return pos + chunk.length
             }, 0)
 
             const zip = new AdmZip(buffer)
             const entry = zip.getEntries()[0]
+            const ninjaName = entry.entryName
 
             const fullDestDir = path.resolve(process.cwd(), destDir)
             if (!fs.existsSync(fullDestDir)) fs.mkdirSync(fullDestDir, {recursive: true})
 
-            zip.extractEntryTo(entry.entryName, fullDestDir)
+            zip.extractEntryTo(ninjaName, fullDestDir, /*maintainEntryPath*/false, /*overwrite*/true)
 
-            const fullFileDir = path.join(fullDestDir, entry.entryName)
+            const fullFileDir = path.join(fullDestDir, ninjaName)
             if (!fs.existsSync(fullFileDir)) throw new Error(`failed to extract to '${fullFileDir}'`)
 
             fs.chmodSync(fullFileDir, '755')
 
-            console.log(`extracted '${entry.entryName}' to '${fullFileDir}'`)
+            console.log(`extracted '${ninjaName}' to '${fullFileDir}'`)
 
-            const result = spawn(fullFileDir, ['--version'], {encoding: 'utf8'})
+            core.addPath(fullDestDir)
+            console.log(`added '${fullDestDir}' to PATH`)
+
+            const result = spawn(ninjaName, ['--version'], {encoding: 'utf8'})
             if (result.error) throw error
 
-            console.log('$ ninja --version')
-            console.log(result.stdout)
+            const installedVersion = result.stdout.trim()
+
+            console.log(`$ ${ninjaName} --version`)
+            console.log(installedVersion)
 
-            core.addPath(fullDestDir)
+            if (installedVersion != version) {
+                throw new Error('incorrect version detected (bad PATH configuration?)')
+            }
         })
     })
     request.on('error', error => { throw error })

diff --git a/index.js b/index.js
@@ -22,7 +22,6 @@ try {
     if (error) throw error
 
     const url = new URL(`https://github.com/ninja-build/ninja/releases/download/v${version}/ninja-${platform}.zip`)
-    //const url = new URL('https://google.com')
     console.log(`downloading ${url}`)
 
     const request = https.get(url, {followAllRedirects: true}, result => {
@@ -34,35 +33,41 @@ try {
             const length = data.reduce((len, chunk) => len + chunk.length, 0)
             const buffer = Buffer.alloc(length)
 
-            console.log(`received file, size ${buffer.length}`)
-
             data.reduce((pos, chunk) => {
                 chunk.copy(buffer, pos)
                 return pos + chunk.length
             }, 0)
 
             const zip = new AdmZip(buffer)
             const entry = zip.getEntries()[0]
+            const ninjaName = entry.entryName
 
             const fullDestDir = path.resolve(process.cwd(), destDir)
             if (!fs.existsSync(fullDestDir)) fs.mkdirSync(fullDestDir, {recursive: true})
 
-            zip.extractEntryTo(entry.entryName, fullDestDir)
+            zip.extractEntryTo(ninjaName, fullDestDir, /*maintainEntryPath*/false, /*overwrite*/true)
 
-            const fullFileDir = path.join(fullDestDir, entry.entryName)
+            const fullFileDir = path.join(fullDestDir, ninjaName)
             if (!fs.existsSync(fullFileDir)) throw new Error(`failed to extract to '${fullFileDir}'`)
 
             fs.chmodSync(fullFileDir, '755')
 
-            console.log(`extracted '${entry.entryName}' to '${fullFileDir}'`)
+            console.log(`extracted '${ninjaName}' to '${fullFileDir}'`)
 
-            const result = spawn(fullFileDir, ['--version'], {encoding: 'utf8'})
+            core.addPath(fullDestDir)
+            console.log(`added '${fullDestDir}' to PATH`)
+
+            const result = spawn(ninjaName, ['--version'], {encoding: 'utf8'})
             if (result.error) throw error
 
-            console.log('$ ninja --version')
-            console.log(result.stdout)
+            const installedVersion = result.stdout.trim()
+
+            console.log(`$ ${ninjaName} --version`)
+            console.log(installedVersion)
 
-            core.addPath(fullDestDir)
+            if (installedVersion != version) {
+                throw new Error('incorrect version detected (bad PATH configuration?)')
+            }
         })
     })
     request.on('error', error => { throw error })