summaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2009-07-24 08:14:21 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2009-07-24 08:14:21 +0000
commit7bfea24048690efa8596623e5ad542a7994c6c4d (patch)
tree6bfd51db9acf0b713ca3168e0deb35f30389d423 /main
parentb70981b68efcce5256eb11c6cd26ae123b10b6ea (diff)
parent6a950ff50d5a74cd7b55d002a53d31d55d2ff2a8 (diff)
downloadaports-7bfea24048690efa8596623e5ad542a7994c6c4d.tar.bz2
aports-7bfea24048690efa8596623e5ad542a7994c6c4d.tar.xz
Merge commit 'remotes/mmason/master'
Conflicts: main/tinyproxy/tinyproxy.install
Diffstat (limited to 'main')
-rw-r--r--main/tinyproxy/tinyproxy.install13
-rwxr-xr-xmain/tinyproxy/tinyproxy.post-install6
-rwxr-xr-xmain/tinyproxy/tinyproxy.pre-install6
3 files changed, 12 insertions, 13 deletions
diff --git a/main/tinyproxy/tinyproxy.install b/main/tinyproxy/tinyproxy.install
deleted file mode 100644
index 5fa366737..000000000
--- 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 000000000..ef518c616
--- /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 000000000..d324b044e
--- /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