Merge e6af43955e into 8726ad3b15

.github/workflows/c-cpp.yml

@@ -1,17 +0,0 @@
-name: C/C++ CI
-
-on:
-  push:
-    branches: [ "master", "**" ]
-  pull_request:
-    branches: [ "master" ]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v3
-    - name: make 
-      run: make 

.github/workflows/macos-matrix.yml

@@ -0,0 +1,50 @@
+name: macos-matrix
+
+# Controls when the action will run.
+on:
+  pull_request:
+    branches:
+      - '*'
+      - '*/*'
+      - '**'
+      - 'master'
+      - 'main'
+  push:
+    branches:
+      - '*'
+      - '*/*'
+      - '**'
+      - 'master'
+      - 'main'
+
+  workflow_dispatch:
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  macos-build_and_test:
+    strategy:
+      matrix:
+        os: [macos-latest, macos-11, macos-12]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: styfle/cancel-workflow-action@0.9.1
+        with:
+          access_token: ${{ github.token }}
+      - uses: actions/checkout@v2
+      - name: printenv
+        run: |
+          brew install libtool autoconf automake 
+          printenv
+      - name: make
+        run: |
+          make
+      - name: sudo make install
+        run: |
+          sudo make install
+      - name: man nostril
+        run: |
+          man nostril
+      - name: sudo -su runner nostril
+        run: |
+          #pipe handles non-zero return from nostril default help
+          sudo -su runner nostril        | echo "${PIPESTATUS[0]}"

.github/workflows/ubuntu-matrix.yml

@@ -0,0 +1,49 @@
+name: ubuntu-matrix
+
+# Controls when the action will run.
+on:
+  pull_request:
+    branches:
+      - '*'
+      - '*/*'
+      - '**'
+      - 'master'
+      - 'main'
+  push:
+    branches:
+      - '*'
+      - '*/*'
+      - '**'
+      - 'master'
+      - 'main'
+
+  workflow_dispatch:
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  ubuntu-build_and_test:
+    strategy:
+      matrix:
+        os: [ubuntu-20.04, ubuntu-latest]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: styfle/cancel-workflow-action@0.9.1
+        with:
+          access_token: ${{ github.token }}
+      - uses: actions/checkout@v2
+      - name: printenv
+        run: |
+          printenv
+      - name: make
+        run: |
+          make
+      - name: sudo make install
+        run: |
+          sudo make install
+      - name: man nostril
+        run: |
+          man nostril
+      - name: sudo -su runner nostril
+        run: |
+          #pipe handles non-zero return from nostril default help
+          sudo -su runner nostril        | echo "${PIPESTATUS[0]}"

.gitignore

@@ -21,3 +21,6 @@ scripts/nostr-req
 scripts/subnote
 /dist
 /version
+
+.DS_Store
+deps/.DS_Store

Makefile

@@ -55,9 +55,11 @@ nostril: $(HEADERS) $(OBJS) $(ARS)
 	$(CC) $(CFLAGS) $(OBJS) $(ARS) -o $@
 
 install: all
-	install -Dm644 doc/nostril.1 $(PREFIX)/share/man/man1/nostril.1
-	install -Dm755 nostril $(PREFIX)/bin/nostril
-	install -Dm755 nostril-query $(PREFIX)/bin/nostril-query
+	mkdir -p $(PREFIX)/share/man/man1
+	mkdir -p $(PREFIX)/bin
+	install -m644 doc/nostril.1 $(PREFIX)/share/man/man1/nostril.1
+	install -m755 nostril $(PREFIX)/bin/nostril
+	install -m755 nostril-query $(PREFIX)/bin/nostril-query
 
 config.h: configurator
 	./configurator > $@