Merge pull request #9 from fr3nch13/fix-eq-error-for-priority

Update bash.yml

Author: fr3nch13

.github/workflows/bash.yml

@@ -15,7 +15,7 @@ permissions:
 jobs:
   run_fail:
     name: Bash - Expect fail
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
     - name: Git checkout
       uses: actions/checkout@v3
@@ -26,11 +26,11 @@ jobs:
     - name: Run script expect fail
       #continue-on-error: true
       run: |
-        ./pushover.sh -v -t badtoken -u badkey -d baddevice -T Github Action Fail -m Github Action Fail || (( $? == 2 )) && exit 0 || exit $?
+        ./pushover.sh -v -t badtoken -u badkey -d baddevice -T Github Action Fail -m Github Action Fail || (( $? == 3 )) && exit 0 || exit $?
 
   run_cli:
     name: Bash - Run with Arguments
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
     - name: Git checkout
       uses: actions/checkout@v3
@@ -44,7 +44,7 @@ jobs:
 
   run_config:
     name: Bash - Run with Config File
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
     - name: Git checkout
       uses: actions/checkout@v3
@@ -62,5 +62,14 @@ jobs:
     - name: Validate with config
       run: ./pushover.sh -v -x -m Github Action Config
 
-    - name: Run script from config
-      run: ./pushover.sh -v -p -2 -m Github Action Config
+    # Eventually move these to a test script.
+    - name: Run script from config, priority 2
+      run: ./pushover.sh -v -m Github Action Config -p -2
+    
+    - name: Run script from config, priority 1
+      run: ./pushover.sh -v -m Github Action Config -p -1
+
+    - name: Run script with bad priority
+      #continue-on-error: true
+      run: |
+        ./pushover.sh -v -m Github Action Bad Priority -p A || (( $? == 4 )) && exit 0 || exit $?

.github/workflows/composer.yml

@@ -14,10 +14,10 @@ permissions:
 
 jobs:
   run_test:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
-        # the Node.js versions to build on
+        # the PHP versions to test on
         php: ['7.4', '8.0', '8.1', '8.2', 'latest']
     name: PHP - ${{ matrix.php }}
     steps:
@@ -45,5 +45,5 @@ jobs:
     - name: Run script via Composer
       run: composer run-script pushover-test
 
-    - name: Run script with Args via Composer
-      run: composer run-script pushover -- -p -2 -m Composer Test Args ${{ matrix.php }}
+    - name: Run script with Args via Composer, priority  1
+      run: composer run-script pushover -- -m Composer Test Args ${{ matrix.php }} -p -1

.github/workflows/npm.yml

@@ -14,10 +14,10 @@ permissions:
 
 jobs:
   run_test:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
-        # the Node.js versions to build on
+        # the Node.js versions to test on
         node: [18, 20]
     name: Node - ${{ matrix.node }}
     steps:
@@ -48,8 +48,5 @@ jobs:
     - name: Run script via NPM
       run:  npm run pushover-test
 
-    - name: Run script with Args via NPM
-      run: npm run pushover -- -p -2 -m Node Test Args ${{ matrix.node }}
-
-    - name: Run via the bin setting
-      run: npm exec pushover-bash -- -p -2 -m Node Test Args ${{ matrix.node }}
+    - name: Run via the bin setting, priority 1
+      run: npm exec pushover-bash -- -m Node Test Args ${{ matrix.node }} -p -1

.github/workflows/publish.yml

@@ -63,10 +63,12 @@ jobs:
           token: ${{ secrets.PUSH_TO_PROTECTED_BRANCH }}
           branch: main
           unprotect_reviews: true
+      # This will bump the package.json, then create a draft release on github.
+      # The draft release will update packagist (composer) when it's published.
       - name: Run release
         run: |
           npm whoami
           npm install
-          # See ROOt/.release-it.sh
+          # See ROOT/.release-it.sh
           # That defines how the release command behaves.
           npm run release -- --ci --verbose ${{ github.event.inputs.version }}${{ github.event.inputs.dry-run == 'true' && ' --dry-run' || '' }}

README.md

@@ -1,3 +1,7 @@
+[![CI Bash](https://github.com/fr3nch13/pushover-bash/actions/workflows/bash.yml/badge.svg)](https://github.com/fr3nch13/pushover-bash/actions/workflows/bash.yml)
+[![CI Composer](https://github.com/fr3nch13/pushover-bash/actions/workflows/composer.yml/badge.svg)](https://github.com/fr3nch13/pushover-bash/actions/workflows/composer.yml)
+[![CI NPM](https://github.com/fr3nch13/pushover-bash/actions/workflows/npm.yml/badge.svg)](https://github.com/fr3nch13/pushover-bash/actions/workflows/npm.yml)
+
 # Pushover Bash Script
 A Bash shell script to send pushover notifications. A [Pushover account](https://pushover.net/) is required to use this script.
 
@@ -96,6 +100,7 @@ title="title for specific user"
 ## Support
 - For PHP Composer based projects, see [COMPOSER.md](COMPOSER.md)
 - For Node.js/NPM based projects, see [NPM.md](NPM.md)
+- Currently working on Python's PyPi
 
 ## Examples
 Send a simple "This is a test" message to all devices using the stored configuration in either **/etc/default/pushover-config**, **$HOME/.pushover/pushover-config**, or **./pushover-config**

pushover.sh

@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 
-set -o errexit
 set -o nounset
 
 readonly API_URL="https://api.pushover.net/1/messages.json"
@@ -203,10 +202,17 @@ do
       myargs[${varname}]=''
     fi
     if [ ${1:0:1} != '-' ]; then
-      myargs[${varname}]="${myargs[${varname}]} ${1}"
-    # priority
-    elif [ ${varname} == 'priority' ]; then
-      myargs[${varname}]=${1}
+      # priority
+      if [ ${varname} == 'priority' ]; then
+        pval=`printf -v int '%d\n' "${1}" 2>/dev/null`
+        if [ $? -ne 0 ]; then
+          echo "Priority must be an integer. You gave: ${1}"
+          exit 4
+        fi
+        myargs[${varname}]=${pval}
+      else
+        myargs[${varname}]="${myargs[${varname}]} ${1}"
+      fi  
     fi
   fi
   shift
@@ -320,7 +326,7 @@ fi
 
 # the resonse from pushover is a failure when the status is 0
 if echo ${response} | grep -q '"status":0,'; then
-  exit 2
+  exit 3
 fi
 
 exit 0