summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorKonstantin Shalygin2015-08-08 11:39:36 +0600
committerKonstantin Shalygin2015-08-08 11:41:34 +0600
commitf29be24dc4d01eeed162ec83616e5dcbb6f6cfc8 (patch)
tree34d5c49bf2c499088f785229d046c516de21a154
parentd5436201bb24f3050cb32fe920fd4491a7b7bd4e (diff)
downloadaur-f29be24dc4d01eeed162ec83616e5dcbb6f6cfc8.tar.gz
Fix mistype in install script.
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD6
-rw-r--r--res_and_conf_dirs.patch2
-rw-r--r--xupnpd.install4
-rw-r--r--xupnpd.service2
5 files changed, 9 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2183b9986c0..8ffb17abf6a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -20,8 +20,8 @@ pkgbase = xupnpd
source = xupnpd.service
source = sysusers.conf
sha256sums = SKIP
- sha256sums = 4214ec45dfe32709d6f6a1d77972c7683d7cd6c75426cf176a598152d30b1e9a
- sha256sums = 460346fa4404d887aa9220d9a011badaaf3728a77d0337316a158a1b89cdc68e
+ sha256sums = 95d436d2bc55bd6fb8affdc4901045d0600092a6045a34f977f79a5950638114
+ sha256sums = 0f6c2a42f676c24dba7bebc804a34f363b12e2dcb4c61bc547c0b722afe09808
sha256sums = 3f669a1034bcfb9923822fb0adf6d5a379beb7a184a89cd4d72a5b02bc072852
pkgname = xupnpd
diff --git a/PKGBUILD b/PKGBUILD
index 12daced7665..fe22d8f95af 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,8 +16,8 @@ source=("${pkgname}::git+https://github.com/clark15b/${pkgname}"
"${pkgname}.service"
"sysusers.conf")
sha256sums=("SKIP"
- "4214ec45dfe32709d6f6a1d77972c7683d7cd6c75426cf176a598152d30b1e9a"
- "460346fa4404d887aa9220d9a011badaaf3728a77d0337316a158a1b89cdc68e"
+ "95d436d2bc55bd6fb8affdc4901045d0600092a6045a34f977f79a5950638114"
+ "0f6c2a42f676c24dba7bebc804a34f363b12e2dcb4c61bc547c0b722afe09808"
"3f669a1034bcfb9923822fb0adf6d5a379beb7a184a89cd4d72a5b02bc072852")
_var="var/lib/${pkgname}"
_usr="usr/share/${pkgname}"
@@ -39,7 +39,7 @@ package() {
install -Dm644 "sysusers.conf" "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf"
cd "${pkgname}/src"
install -Dm755 "${pkgname}" "${pkgdir}/usr/bin/${pkgname}"
- install -dm755 -o 187 -g 187 "${pkgdir}/var/run/${pkgname}"
+ install -dm755 -o 187 -g 187 "${pkgdir}/run/${pkgname}"
install -dm755 -o 187 -g 187 "${pkgdir}/${_var}/config"
install -dm755 -o 187 -g 187 "${pkgdir}/${_var}/localmedia"
install -Dm644 -o 187 -g 187 *.lua -t "${pkgdir}/${_var}"
diff --git a/res_and_conf_dirs.patch b/res_and_conf_dirs.patch
index 7a41da22cd2..a7db5d9efc3 100644
--- a/res_and_conf_dirs.patch
+++ b/res_and_conf_dirs.patch
@@ -19,7 +19,7 @@ diff -Naupr xupnpd_orig/src/xupnpd.lua xupnpd/src/xupnpd.lua
cfg.log_ident=arg[1] or 'xupnpd'
-cfg.pid_file='/var/run/'..cfg.log_ident..'.pid'
-cfg.www_root='./www/'
-+cfg.pid_file='/var/run/xupnpd/xupnpd.pid'
++cfg.pid_file='/run/xupnpd/xupnpd.pid'
+cfg.www_root='/usr/share/xupnpd/www/'
cfg.tmp_path='/tmp/'
-cfg.plugin_path='./plugins/'
diff --git a/xupnpd.install b/xupnpd.install
index 01c170fe0a0..87c83ab9c07 100644
--- a/xupnpd.install
+++ b/xupnpd.install
@@ -1,9 +1,9 @@
post_install() {
- /usr/bin/systemd-sysusers xunpnpd.conf
+ /usr/bin/systemd-sysusers xupnpd.conf
/usr/bin/systemctl daemon-reload
}
post_remove() {
/usr/bin/systemctl daemon-reload
- /usr/bin/userdel xunpnpd > /dev/null
+ /usr/bin/userdel xupnpd > /dev/null
}
diff --git a/xupnpd.service b/xupnpd.service
index 14f1187615a..bbf4c2d6fd2 100644
--- a/xupnpd.service
+++ b/xupnpd.service
@@ -7,7 +7,7 @@ Wants=udpxy.service
User=xupnpd
Group=xupnpd
Type=forking
-PIDFile=/var/run/xupnpd/xupnpd.pid
+PIDFile=/run/xupnpd/xupnpd.pid
ExecStart=/usr/bin/xupnpd
[Install]