From d5fa083d689df727206e6c87f604212e9dcc4811 Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Mon, 28 Jan 2019 00:08:07 -0800
Subject: Simplified PKGBUILD

---
 PKGBUILD            | 24 +++++++++-------------
 sysctl-repeat.initd | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 sysctl-v2.initd     | 58 -----------------------------------------------------
 3 files changed, 68 insertions(+), 72 deletions(-)
 create mode 100755 sysctl-repeat.initd
 delete mode 100755 sysctl-v2.initd

diff --git a/PKGBUILD b/PKGBUILD
index 941a8b4..c5b50c7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,27 +3,23 @@
 # # I maintain this because:
 # Some sysctl parameters require being set twice to apply
 
-pkgname=sysctl-v2-openrc
-pkgver=20181217
+_pkgname=sysctl
+_exname=${_pkgname}-repeat
+pkgname=${_pkgname}-openrc-repeat
+pkgver=20190127
 pkgrel=1
-pkgdesc="OpenRC sysctl-v2 init script"
+pkgdesc="OpenRC sysctl init script for stubborn sysctl prefs"
 arch=('any')
+replaces=('sysctl-v2-openrc')
 url="https://neueland.iserlohn-fortress.net/gitea/jc_gargma"
 license=('GPL2')
 groups=('openrc-system')
 depends=('openrc')
-backup=('etc/init.d/sysctl-v2')
-source=("sysctl-v2.initd")
+source=(
+        "${_exname}.initd"
+        )
 sha256sums=('ed64389a37ad710aede890084d5e6886a807622f6eae341d32ab9fdda6f850a7')
 
-#pkgver() {
-#    date +%Y%m%d
-#}
-
-_inst_initd(){
-    install -Dm755 ${srcdir}/$1.initd ${pkgdir}/etc/init.d/$1
-}
-
 package() {
-    _inst_initd 'sysctl-v2'
+    install -Dm755 ${srcdir}/${_exname}.initd ${pkgdir}/etc/init.d/${_exname}
 }
diff --git a/sysctl-repeat.initd b/sysctl-repeat.initd
new file mode 100755
index 0000000..af17148
--- /dev/null
+++ b/sysctl-repeat.initd
@@ -0,0 +1,58 @@
+#!/usr/bin/openrc-run
+# Copyright (c) 2007-2015 The OpenRC Authors.
+# See the Authors file at the top-level directory of this distribution and
+# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+#
+# This file is part of OpenRC. It is subject to the license terms in
+# the LICENSE file found in the top-level directory of this
+# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# This file may not be copied, modified, propagated, or distributed
+# except according to the terms contained in the LICENSE file.
+
+depend()
+{
+	after clock
+	before bootmisc logger
+	keyword -prefix -systemd-nspawn -vserver
+}
+
+BSD_sysctl()
+{
+	[ -e /etc/sysctl.conf ] || return 0
+	local retval=0 var= comments= conf=
+	eindent
+	for conf in /etc/sysctl.conf /etc/sysctl.d/*.conf; do
+		if [ -r "$conf" ]; then
+			vebegin "applying $conf"
+			while read var comments; do
+				case "$var" in
+				""|"#"*) continue;;
+				esac
+				sysctl -w "$var" >/dev/null || retval=1
+			done < "$conf"
+			veend $retval
+		fi
+	done
+	eoutdent
+	return $retval
+}
+
+Linux_sysctl()
+{
+	local quiet
+	yesno $rc_verbose || quiet=-q
+
+	sysctl ${quiet} --system
+}
+
+start()
+{
+	local rc=0
+
+	ebegin "Configuring kernel parameters"
+	case "$RC_UNAME" in
+	*BSD|GNU) BSD_sysctl; rc=$? ;;
+	Linux) Linux_sysctl; rc=$? ;;
+	esac
+	eend $rc "Unable to configure some kernel parameters"
+}
diff --git a/sysctl-v2.initd b/sysctl-v2.initd
deleted file mode 100755
index af17148..0000000
--- a/sysctl-v2.initd
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/usr/bin/openrc-run
-# Copyright (c) 2007-2015 The OpenRC Authors.
-# See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
-#
-# This file is part of OpenRC. It is subject to the license terms in
-# the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
-# This file may not be copied, modified, propagated, or distributed
-# except according to the terms contained in the LICENSE file.
-
-depend()
-{
-	after clock
-	before bootmisc logger
-	keyword -prefix -systemd-nspawn -vserver
-}
-
-BSD_sysctl()
-{
-	[ -e /etc/sysctl.conf ] || return 0
-	local retval=0 var= comments= conf=
-	eindent
-	for conf in /etc/sysctl.conf /etc/sysctl.d/*.conf; do
-		if [ -r "$conf" ]; then
-			vebegin "applying $conf"
-			while read var comments; do
-				case "$var" in
-				""|"#"*) continue;;
-				esac
-				sysctl -w "$var" >/dev/null || retval=1
-			done < "$conf"
-			veend $retval
-		fi
-	done
-	eoutdent
-	return $retval
-}
-
-Linux_sysctl()
-{
-	local quiet
-	yesno $rc_verbose || quiet=-q
-
-	sysctl ${quiet} --system
-}
-
-start()
-{
-	local rc=0
-
-	ebegin "Configuring kernel parameters"
-	case "$RC_UNAME" in
-	*BSD|GNU) BSD_sysctl; rc=$? ;;
-	Linux) Linux_sysctl; rc=$? ;;
-	esac
-	eend $rc "Unable to configure some kernel parameters"
-}
-- 
cgit v1.2.1