Merge commit 'remotes/mmason/master'

Conflicts:
	main/tinyproxy/tinyproxy.install

3 files changed, 12 insertions, 13 deletions

diff --git a/main/tinyproxy/tinyproxy.install b/main/tinyproxy/tinyproxy.install
deleted file mode 100644
index 5fa366737be..00000000000
--- a/main/tinyproxy/tinyproxy.install
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-case "$1" in
-	pre_install)
-		adduser -h /dev/null -s /bin/false -D tinyproxy 2>/dev/null
-		;;
-	post_install)
-		chown tinyproxy:tinyproxy /var/run/tinyproxy
-		;;
-esac
-
-# return with success even if user already exist
-exit 0
diff --git a/main/tinyproxy/tinyproxy.post-install b/main/tinyproxy/tinyproxy.post-install
new file mode 100755
index 00000000000..ef518c61620
--- /dev/null
+++ b/main/tinyproxy/tinyproxy.post-install
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+chown tinyproxy:tinyproxy /var/run/tinyproxy
+
+# return with success even if user already exist
+exit 0
diff --git a/main/tinyproxy/tinyproxy.pre-install b/main/tinyproxy/tinyproxy.pre-install
new file mode 100755
index 00000000000..d324b044e35
--- /dev/null
+++ b/main/tinyproxy/tinyproxy.pre-install
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+adduser -h /dev/null -s /bin/false -D tinyproxy 2>/dev/null
+
+# return with success even if user already exist
+exit 0