From b950e9da95911b79b5818451610fb080148d4f97 Mon Sep 17 00:00:00 2001
From: Philipp Heckel <pheckel@datto.com>
Date: Thu, 9 Dec 2021 14:04:41 -0500
Subject: [PATCH] Fix #47 issue with 1.5.2
---
docs/install.md | 18 +++++++++---------
scripts/postinst.sh | 2 +-
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/docs/install.md b/docs/install.md
index eb4e1d1..7586ac6 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -20,21 +20,21 @@ deb/rpm packages.
=== "x86_64/amd64"
```bash
- wget https://github.com/binwiederhier/ntfy/releases/download/v1.5.2/ntfy_1.5.2_linux_x86_64.tar.gz
+ wget https://github.com/binwiederhier/ntfy/releases/download/v1.5.3/ntfy_1.5.3_linux_x86_64.tar.gz
sudo tar -C /usr/bin -zxf ntfy_*.tar.gz ntfy
sudo ./ntfy
```
=== "armv7/armhf"
```bash
- wget https://github.com/binwiederhier/ntfy/releases/download/v1.5.2/ntfy_1.5.2_linux_armv7.tar.gz
+ wget https://github.com/binwiederhier/ntfy/releases/download/v1.5.3/ntfy_1.5.3_linux_armv7.tar.gz
sudo tar -C /usr/bin -zxf ntfy_*.tar.gz ntfy
sudo ./ntfy
```
=== "arm64"
```bash
- wget https://github.com/binwiederhier/ntfy/releases/download/v1.5.2/ntfy_1.5.2_linux_arm64.tar.gz
+ wget https://github.com/binwiederhier/ntfy/releases/download/v1.5.3/ntfy_1.5.3_linux_arm64.tar.gz
sudo tar -C /usr/bin -zxf ntfy_*.tar.gz ntfy
sudo ./ntfy
```
@@ -82,7 +82,7 @@ Manually installing the .deb file:
=== "x86_64/amd64"
```bash
- wget https://github.com/binwiederhier/ntfy/releases/download/v1.5.2/ntfy_1.5.2_linux_amd64.deb
+ wget https://github.com/binwiederhier/ntfy/releases/download/v1.5.3/ntfy_1.5.3_linux_amd64.deb
sudo dpkg -i ntfy_*.deb
sudo systemctl enable ntfy
sudo systemctl start ntfy
@@ -90,7 +90,7 @@ Manually installing the .deb file:
=== "armv7/armhf"
```bash
- wget https://github.com/binwiederhier/ntfy/releases/download/v1.5.2/ntfy_1.5.2_linux_armv7.deb
+ wget https://github.com/binwiederhier/ntfy/releases/download/v1.5.3/ntfy_1.5.3_linux_armv7.deb
sudo dpkg -i ntfy_*.deb
sudo systemctl enable ntfy
sudo systemctl start ntfy
@@ -98,7 +98,7 @@ Manually installing the .deb file:
=== "arm64"
```bash
- wget https://github.com/binwiederhier/ntfy/releases/download/v1.5.2/ntfy_1.5.2_linux_arm64.deb
+ wget https://github.com/binwiederhier/ntfy/releases/download/v1.5.3/ntfy_1.5.3_linux_arm64.deb
sudo dpkg -i ntfy_*.deb
sudo systemctl enable ntfy
sudo systemctl start ntfy
@@ -108,21 +108,21 @@ Manually installing the .deb file:
=== "x86_64/amd64"
```bash
- sudo rpm -ivh https://github.com/binwiederhier/ntfy/releases/download/v1.5.2/ntfy_1.5.2_linux_amd64.rpm
+ sudo rpm -ivh https://github.com/binwiederhier/ntfy/releases/download/v1.5.3/ntfy_1.5.3_linux_amd64.rpm
sudo systemctl enable ntfy
sudo systemctl start ntfy
```
=== "armv7/armhf"
```bash
- sudo rpm -ivh https://github.com/binwiederhier/ntfy/releases/download/v1.5.2/ntfy_1.5.2_linux_armv7.rpm
+ sudo rpm -ivh https://github.com/binwiederhier/ntfy/releases/download/v1.5.3/ntfy_1.5.3_linux_armv7.rpm
sudo systemctl enable ntfy
sudo systemctl start ntfy
```
=== "arm64"
```bash
- sudo rpm -ivh https://github.com/binwiederhier/ntfy/releases/download/v1.5.2/ntfy_1.5.2_linux_arm64.rpm
+ sudo rpm -ivh https://github.com/binwiederhier/ntfy/releases/download/v1.5.3/ntfy_1.5.3_linux_arm64.rpm
sudo systemctl enable ntfy
sudo systemctl start ntfy
```
diff --git a/scripts/postinst.sh b/scripts/postinst.sh
index 2fa34e7..8ecf6c5 100755
--- a/scripts/postinst.sh
+++ b/scripts/postinst.sh
@@ -15,7 +15,7 @@ if [ "$1" = "configure" ] && [ -d /run/systemd/system ]; then
# Hack to change permissions on cache file
configfile="/etc/ntfy/config.yml"
if [ -f "$configfile" ]; then
- cachefile="$(cat "$configfile" | perl -n -e'/^\s*cache-file: (.+)/ && print $1')"
+ cachefile="$(cat "$configfile" | perl -n -e'/^\s*cache-file: ["'"'"']?([^"'"'"']+)["'"'"']?/ && print $1')" # Oh my, see #47
if [ -n "$cachefile" ]; then
chown ntfy.ntfy "$cachefile" || true
fi
--
GitLab