From 4ea3a8b067a65e9e58a925f620f249307c7a62ed Mon Sep 17 00:00:00 2001
From: Jan-Tarek Butt <buttjantarek@googlemail.com>
Date: Sat, 18 Jul 2015 07:11:15 +0200
Subject: [PATCH] undo "Implemented an good way to replace base files"
---
banner/Makefile | 42 +++----------------
.../banner.ffnw => lib/ffnw/banner/banner} | 0
banner/files/lib/ffnw/banner/banner.sh | 15 +++++++
banner/files/lib/gluon/cron/ffnw-banner | 1 +
4 files changed, 21 insertions(+), 37 deletions(-)
rename banner/files/{etc/banner.ffnw => lib/ffnw/banner/banner} (100%)
create mode 100644 banner/files/lib/ffnw/banner/banner.sh
create mode 100644 banner/files/lib/gluon/cron/ffnw-banner
diff --git a/banner/Makefile b/banner/Makefile
index 3714da7..c8894cc 100644
--- a/banner/Makefile
+++ b/banner/Makefile
@@ -12,9 +12,6 @@ define Package/ffnw-banner
SECTION:=config
CATEGORY:=Freifunk Nordwest
TITLE:=Nordwest freifunk shell banner
- MAINTAINER:=Freifunk Nordwest <tarek@ring0.de>
- URL:=https://git.nordwest.freifunk.net/ffnw/packages
- SOURCE:=git@git.nordwest.freifunk.net:ffnw/packages.git
endef
define Package/ffnw-banner/description
@@ -31,41 +28,12 @@ endef
define Build/Compile
endef
-define Package/ffnw-banner/preinst
- #!/bin/sh
- cd "$${IPKG_INSTROOT}/etc/"
- if [ -h "./banner" ] ; then
- /bin/rm "./banner"
- elif [ -f "./banner" ] ; then
- /bin/mv "./banner" "/tmp/banner.openwrt"
- fi
- /bin/ln -s "/tmp/banner.openwrt" "/etc/banner"
- exit 0
-endef
-
-define Package/ffnw-banner/postinst
- #!/bin/sh
- cd "$${IPKG_INSTROOT}/etc/"
- [ -h "./banner" ] && /bin/rm -f "./banner"
- /bin/mv "./banner.ffnw" "./banner"
- exit $$?
-endef
-
-define Package/ffnw-banner/prerm
- #!/bin/sh
- cd "$${IPKG_INSTROOT}/etc/"
- if [ -h "./banner" ] ; then
- [[ "$$(readlink -n ./banner)" == "./banner.ffnw" ]] && \
- /bin/rm -f "./banner" && \
- [ -f "/tmp/banner.openwrt" ] && \
- /bin/ln -s "./banner.openwrt" "./banner"
- fi
- exit 0
-endef
-
define Package/ffnw-banner/install
- $(INSTALL_DIR) $(1)/etc/
- $(INSTALL_DATA) files/etc/banner.ffnw $(1)/etc/
+ $(INSTALL_DIR) $(1)/lib/gluon/cron/
+ $(INSTALL_DATA) files/lib/gluon/cron/ffnw-banner $(1)/lib/gluon/cron/ffnw-banner
+ $(INSTALL_DIR) $(1)/lib/ffnw/banner/
+ $(INSTALL_BIN) files/lib/ffnw/banner/banner.sh $(1)/lib/ffnw/banner/
+ $(INSTALL_CONF) files/lib/ffnw/banner/banner $(1)/lib/ffnw/banner/
endef
$(eval $(call BuildPackage,ffnw-banner))
diff --git a/banner/files/etc/banner.ffnw b/banner/files/lib/ffnw/banner/banner
similarity index 100%
rename from banner/files/etc/banner.ffnw
rename to banner/files/lib/ffnw/banner/banner
diff --git a/banner/files/lib/ffnw/banner/banner.sh b/banner/files/lib/ffnw/banner/banner.sh
new file mode 100644
index 0000000..44166b7
--- /dev/null
+++ b/banner/files/lib/ffnw/banner/banner.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+cleanup () {
+ rm -rf /lib/gluon/cron/ffnw-banner
+ rm -rf /lib/ffnw/banner
+ }
+
+ grep -Fxvf /etc/banner /lib/ffnw/banner/banner > /dev/null
+if [ $? -eq 0 ]; then
+ mv /lib/ffnw/banner/banner /etc/banner
+ cleanup
+else
+ cleanup
+fi
+
diff --git a/banner/files/lib/gluon/cron/ffnw-banner b/banner/files/lib/gluon/cron/ffnw-banner
new file mode 100644
index 0000000..f021036
--- /dev/null
+++ b/banner/files/lib/gluon/cron/ffnw-banner
@@ -0,0 +1 @@
+*/5 * * * * sh /lib/ffnw/banner/banner.sh
--
GitLab