diff --git a/gluon-ssid-changer/Makefile b/gluon-ssid-changer/Makefile index d23391a074f9ae656b557f9177b24a6b7372c256..b57e8d84275f4f98fe88ebbe82dfad81ac9252fe 100644 --- a/gluon-ssid-changer/Makefile +++ b/gluon-ssid-changer/Makefile @@ -1,18 +1,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gluon-ssid-changer -PKG_VERSION:=4 - -PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) +PKG_VERSION:=5 include $(TOPDIR)/../package/gluon.mk -PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG) - - define Package/$(PKG_NAME) - SECTION:=gluon - CATEGORY:=Gluon TITLE:=changes the SSID to an Offline-SSID so clients don't connect to an offline WiFi DEPENDS:=+gluon-core +micrond endef @@ -26,28 +19,18 @@ define Package/$(PKG_NAME)/description timeframe. endef -define Build/Prepare - mkdir -p $(PKG_BUILD_DIR) -endef - -define Build/Configure -endef define Build/Compile - $(call GluonBuildI18N,$(PKG_NAME),i18n) - $(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/) + $(call Gluon/Build/Compile) + ./gluonShellDiet.sh shsrc/ssid-changer.sh > $(PKG_BUILD_DIR)/ssid-changer.sh endef define Package/$(PKG_NAME)/install - $(CP) ./files/* $(1)/ - $(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/ - ./gluonShellDiet.sh $(1)/lib/gluon/ssid-changer/ssid-changer.sh - $(call GluonInstallI18N,$(PKG_NAME),$(1)) -endef + $(Gluon/Build/Install) -define Package/$(PKG_NAME)/postinst -#!/bin/sh -$(call GluonCheckSite,check_site.lua) + $(INSTALL_DIR) $(1)/lib/gluon/ssid-changer + $(INSTALL_BIN) $(PKG_BUILD_DIR)/ssid-changer.sh $(1)/lib/gluon/ssid-changer/ endef -$(eval $(call BuildPackage,$(PKG_NAME))) + +$(eval $(call BuildPackageGluon,$(PKG_NAME))) diff --git a/gluon-ssid-changer/gluonShellDiet.sh b/gluon-ssid-changer/gluonShellDiet.sh index 6e02407628ab1d82dee810fc8df870699b249c5f..1cb74ad6caff0c6fc17e80934c6404e891393979 100755 --- a/gluon-ssid-changer/gluonShellDiet.sh +++ b/gluon-ssid-changer/gluonShellDiet.sh @@ -2,4 +2,4 @@ # This script requires a file as argument in which it will remove all comment lines that start with a hash '#' -sed -i '/^\s*\#[^!].*/d; /^\s*\#$/d' $1 +sed '/^\s*\#[^!].*/d; /^\s*\#$/d' $1 diff --git a/gluon-ssid-changer/files/lib/gluon/ssid-changer/ssid-changer.sh b/gluon-ssid-changer/shsrc/ssid-changer.sh similarity index 100% rename from gluon-ssid-changer/files/lib/gluon/ssid-changer/ssid-changer.sh rename to gluon-ssid-changer/shsrc/ssid-changer.sh