mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-21 00:12:58 +02:00
Merge branch 'master' into next
This commit is contained in:
@@ -32,9 +32,9 @@ DL_FROM = $(URL_IPFIRE)
|
||||
DIR_APP = $(DIR_SRC)/epgsearch-$(VER)
|
||||
TARGET = $(DIR_INFO)/$(THISAPP)
|
||||
PROG = vdr_epgsearch
|
||||
PAK_VER = 6
|
||||
PAK_VER = 7
|
||||
|
||||
DEPS = "vdr"
|
||||
DEPS = ""
|
||||
|
||||
VDRPLUGVER = 2.0.0
|
||||
|
||||
|
||||
@@ -33,9 +33,9 @@ DL_FROM = $(URL_IPFIRE)
|
||||
DIR_APP = $(DIR_SRC)/$(THISAPP)
|
||||
TARGET = $(DIR_INFO)/$(THISAPP)
|
||||
PROG = vdr_streamdev
|
||||
PAK_VER = 1
|
||||
PAK_VER = 2
|
||||
|
||||
DEPS = "vdr"
|
||||
DEPS = ""
|
||||
|
||||
VDRPLUGVER = 2.0.0
|
||||
|
||||
|
||||
@@ -32,9 +32,9 @@ DL_FROM = $(URL_IPFIRE)
|
||||
DIR_APP = $(DIR_SRC)/$(THISAPP)
|
||||
TARGET = $(DIR_INFO)/$(THISAPP)
|
||||
PROG = vdr_vnsiserver3
|
||||
PAK_VER = 1
|
||||
PAK_VER = 2
|
||||
|
||||
DEPS = "vdr"
|
||||
DEPS = ""
|
||||
|
||||
VDRPLUGVER = 2.0.0
|
||||
|
||||
|
||||
@@ -29,7 +29,7 @@ OLD_DIR="/opt/vdr/etc"
|
||||
NEW_DIR="/etc/vdr"
|
||||
|
||||
for conf in ${OLD_DIR}/*.conf; do
|
||||
[ -f "${conf}" ] && continue
|
||||
[ -f "${conf}" ] || continue
|
||||
|
||||
conf="$(basename ${conf})"
|
||||
mv -b "${OLD_DIR}/${conf}" "${NEW_DIR}/${conf}"
|
||||
|
||||
Reference in New Issue
Block a user