apt.js - always run update

Author: MSP-Greg

README.md

@@ -36,7 +36,7 @@ Installs Bundler using the code from [ruby/setup-ruby].
 
 ### apt: (Ubuntu)
 
-List of packages to install.  Space delimited. Special options are `_update_` and `_upgrade_`.
+List of packages to install.  Space delimited. Including `_upgrade_` will do so.  `update` is always done.
 
 ### brew: (macOS)
 

apt.js

@@ -8,20 +8,19 @@ const { execSync } = require('./common')
 let apt = core.getInput('apt-get').replace(/[^a-z_ \d.-]+/gi, '').trim().toLowerCase()
 
 export const run = async () => {
+  let needUpdate = true
   try {
     if (apt !== '') {
-      if (apt.includes('_update_')) {
-        execSync('sudo apt-get -qy update')
-        apt = apt.replace(/\b_update_\b/gi, '').trim()
-      }
 
       if (apt.includes('_upgrade_')) {
         execSync('sudo apt-get -qy update')
+        needUpdate = false
         execSync('sudo apt-get -qy dist-upgrade')
         apt = apt.replace(/\b_upgrade_\b/gi, '').trim()
       }
 
       if (apt !== '') {
+        if (needUpdate) { execSync('sudo apt-get -qy update') }
         execSync(`sudo apt-get -qy --no-install-recommends install ${apt}`)
       }
     }

dist/index.js

@@ -68,20 +68,19 @@ const { execSync } = __webpack_require__(498)
 let apt = core.getInput('apt-get').replace(/[^a-z_ \d.-]+/gi, '').trim().toLowerCase()
 
 const run = async () => {
+  let needUpdate = true
   try {
     if (apt !== '') {
-      if (apt.includes('_update_')) {
-        execSync('sudo apt-get -qy update')
-        apt = apt.replace(/\b_update_\b/gi, '').trim()
-      }
 
       if (apt.includes('_upgrade_')) {
         execSync('sudo apt-get -qy update')
+        needUpdate = false
         execSync('sudo apt-get -qy dist-upgrade')
         apt = apt.replace(/\b_upgrade_\b/gi, '').trim()
       }
 
       if (apt !== '') {
+        if (needUpdate) { execSync('sudo apt-get -qy update') }
         execSync(`sudo apt-get -qy --no-install-recommends install ${apt}`)
       }
     }