From: Nicolas Thill <nico@openwrt.org>
Date: Thu, 17 Nov 2011 11:48:53 +0000 (+0000)
Subject: packages/ftpd-topfield: rename initscript & uci config files
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=a08d510fef7d056f5aeadac4e0f0c288dcd6fdb5

packages/ftpd-topfield: rename initscript & uci config files

SVN-Revision: 29223
---

diff --git a/multimedia/ftpd-topfield/Makefile b/multimedia/ftpd-topfield/Makefile
index a43169580b..c271cb4a0c 100644
--- a/multimedia/ftpd-topfield/Makefile
+++ b/multimedia/ftpd-topfield/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ftpd-topfield
 PKG_VERSION:=0.7.4
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/puppy
@@ -36,9 +36,9 @@ define Package/ftpd-topfield/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ftpd $(1)/usr/sbin/ftpd-topfield
 	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/ftpd-topfield.sh $(1)/etc/init.d/ftpd-topfield
+	$(INSTALL_BIN) ./files/ftpd-topfield.init $(1)/etc/init.d/ftpd-topfield
 	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_DATA) ./files/ftpd-topfield.conf $(1)/etc/config/ftpd-topfield
+	$(INSTALL_DATA) ./files/ftpd-topfield.config $(1)/etc/config/ftpd-topfield
 endef
 
 define Package/ftpd-topfield/conffiles
diff --git a/multimedia/ftpd-topfield/files/ftpd-topfield.conf b/multimedia/ftpd-topfield/files/ftpd-topfield.conf
deleted file mode 100644
index ec5ef2ea53..0000000000
--- a/multimedia/ftpd-topfield/files/ftpd-topfield.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-config 'ftpd-topfield'
-	option 'port' '21'
-	option 'turbo' 'disabled'
-	option 'elpf' 'disabled'
diff --git a/multimedia/ftpd-topfield/files/ftpd-topfield.config b/multimedia/ftpd-topfield/files/ftpd-topfield.config
new file mode 100644
index 0000000000..ec5ef2ea53
--- /dev/null
+++ b/multimedia/ftpd-topfield/files/ftpd-topfield.config
@@ -0,0 +1,4 @@
+config 'ftpd-topfield'
+	option 'port' '21'
+	option 'turbo' 'disabled'
+	option 'elpf' 'disabled'
diff --git a/multimedia/ftpd-topfield/files/ftpd-topfield.init b/multimedia/ftpd-topfield/files/ftpd-topfield.init
new file mode 100644
index 0000000000..27c4825748
--- /dev/null
+++ b/multimedia/ftpd-topfield/files/ftpd-topfield.init
@@ -0,0 +1,35 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2006 OpenWrt.org
+
+START=50
+
+config_cb() {
+	local cfg="$CONFIG_SECTION"
+	local cfgt
+	config_get cfgt "$cfg" TYPE
+
+	case "$cfgt" in
+		ftpd-topfield)
+			config_get turbo $cfg turbo
+			config_get port $cfg port
+			config_get elpf $cfg elpf
+
+			case "$turbo" in
+				yes|on|enabled|1) turbo=1;;
+			esac
+			case "$elpf" in
+				yes|on|enabled|1) elpf=1;;
+			esac
+			TOPFIELD_ARGS="-D ${turbo:+--turbo }${port:+-P $port }${elpf:+-E}"
+		;;
+	esac
+}
+                                                                                                                                                                                                            
+start() {
+	config_load ftpd-topfield
+	/usr/sbin/ftpd-topfield $TOPFIELD_ARGS 
+}
+  
+stop() {
+    killall ftpd-topfield
+}
diff --git a/multimedia/ftpd-topfield/files/ftpd-topfield.sh b/multimedia/ftpd-topfield/files/ftpd-topfield.sh
deleted file mode 100644
index 27c4825748..0000000000
--- a/multimedia/ftpd-topfield/files/ftpd-topfield.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2006 OpenWrt.org
-
-START=50
-
-config_cb() {
-	local cfg="$CONFIG_SECTION"
-	local cfgt
-	config_get cfgt "$cfg" TYPE
-
-	case "$cfgt" in
-		ftpd-topfield)
-			config_get turbo $cfg turbo
-			config_get port $cfg port
-			config_get elpf $cfg elpf
-
-			case "$turbo" in
-				yes|on|enabled|1) turbo=1;;
-			esac
-			case "$elpf" in
-				yes|on|enabled|1) elpf=1;;
-			esac
-			TOPFIELD_ARGS="-D ${turbo:+--turbo }${port:+-P $port }${elpf:+-E}"
-		;;
-	esac
-}
-                                                                                                                                                                                                            
-start() {
-	config_load ftpd-topfield
-	/usr/sbin/ftpd-topfield $TOPFIELD_ARGS 
-}
-  
-stop() {
-    killall ftpd-topfield
-}