From e80fe2cc785c8c66440ff5ba9095bc080141cb44 Mon Sep 17 00:00:00 2001 From: bioxz <bioxz@stderr.cc> Date: Sat, 4 Oct 2014 00:26:36 +0200 Subject: [PATCH] Renamed ffol to ffnw in package fastdreg --- fastdreg/Makefile | 16 ++++++++-------- .../lib/{ffol => ffnw}/fastdreg/fastdreg.sh | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) rename fastdreg/files/lib/{ffol => ffnw}/fastdreg/fastdreg.sh (80%) diff --git a/fastdreg/Makefile b/fastdreg/Makefile index 85d153b..d04b126 100644 --- a/fastdreg/Makefile +++ b/fastdreg/Makefile @@ -1,6 +1,6 @@ include $(TOPDIR)/rules.mk -PKG_NAME:=ffol-fastdreg +PKG_NAME:=ffnw-fastdreg PKG_VERSION:=1 PKG_RELEASE:=1 @@ -8,14 +8,14 @@ PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) include $(INCLUDE_DIR)/package.mk -define Package/ffol-fastdreg +define Package/ffnw-fastdreg SECTION:=fastd - CATEGORY:=Freifunk Oldenburg + CATEGORY:=Freifunk Nordwest TITLE:=Adds script which registers fastd-key DEPENDS:=+gluon-mesh-vpn-fastd endef -define Package/ffol-fastdreg/description +define Package/ffnw-fastdreg/description Adds script which registers fastd-key endef @@ -29,13 +29,13 @@ endef define Build/Compile endef -define Package/ffol-fastdreg/install +define Package/ffnw-fastdreg/install $(INSTALL_DIR) $(1)/lib/gluon/cron/ $(INSTALL_DATA) files/lib/gluon/cron/fastdreg $(1)/lib/gluon/cron/fastdreg - $(INSTALL_DIR) $(1)/lib/ffol/fastdreg/ - $(INSTALL_BIN) files/lib/ffol/fastdreg/fastdreg.sh $(1)/lib/ffol/fastdreg/ + $(INSTALL_DIR) $(1)/lib/ffnw/fastdreg/ + $(INSTALL_BIN) files/lib/ffnw/fastdreg/fastdreg.sh $(1)/lib/ffnw/fastdreg/ $(INSTALL_DIR) $(1)/etc/config/ $(INSTALL_CONF) files/fastdreg.config $(1)/etc/config/fastdreg endef -$(eval $(call BuildPackage,ffol-fastdreg)) +$(eval $(call BuildPackage,ffnw-fastdreg)) diff --git a/fastdreg/files/lib/ffol/fastdreg/fastdreg.sh b/fastdreg/files/lib/ffnw/fastdreg/fastdreg.sh similarity index 80% rename from fastdreg/files/lib/ffol/fastdreg/fastdreg.sh rename to fastdreg/files/lib/ffnw/fastdreg/fastdreg.sh index fe224ab..73eb956 100755 --- a/fastdreg/files/lib/ffol/fastdreg/fastdreg.sh +++ b/fastdreg/files/lib/ffnw/fastdreg/fastdreg.sh @@ -7,12 +7,12 @@ hostname=$(uci get system.@system[0].hostname) pubkey=$(/etc/init.d/fastd show_key mesh_vpn) -regdone=$(uci get fastdreg.ffol.regdone) +regdone=$(uci get fastdreg.ffnw.regdone) if [ "$regdone" -ne "1" ]; then reg=$(wget -T15 "$keysrv/reg.php?name=$hostname&key=$pubkey" -O -) if [ "$reg" == "regdone" ]; then - uci set fastdreg.ffol.regdone=1 + uci set fastdreg.ffnw.regdone=1 uci commit fi fi -- GitLab