diff --git a/synology/build.sh b/synology/build.sh index 172d06341..b5b1c0246 100755 --- a/synology/build.sh +++ b/synology/build.sh @@ -26,8 +26,8 @@ generate_package_sources() # Generate the SPK # Copy package scripts to spksrc so they're accessible to container - rm -rf spksrc/ztpkg-dsm6 - cp -rf ztpkg-dsm6 spksrc/ztpkg-dsm6 + rm -rf spksrc/dsm6-pkg + cp -rf dsm6-pkg spksrc/dsm6-pkg TAB="$(printf '\t')" @@ -98,7 +98,7 @@ cat > spksrc/spk/zerotier/Makefile <<- EOM SPK_NAME = zerotier SPK_VERS = $ZTO_VER SPK_REV = $PKG_REV -SPK_ICON = /spksrc/ztpkg-dsm6/PACKAGE_ICON_256.png +SPK_ICON = /spksrc/dsm6-pkg/PACKAGE_ICON_256.png DEPENDS = cross/zerotier MAINTAINER = ZeroTier, Inc. DESCRIPTION = $ZTO_DESC @@ -114,7 +114,7 @@ REQUIRED_DSM = 6.2.4 ENV += ZT_SYNOLOGY=1 -SSS_SCRIPT = ../../ztpkg-dsm6/start-stop-status.sh +SSS_SCRIPT = ../../dsm6-pkg/start-stop-status.sh PRE_STRIP_TARGET = zerotier_install diff --git a/synology/ztpkg-dsm6/PACKAGE_ICON.png b/synology/dsm6-pkg/PACKAGE_ICON.png similarity index 100% rename from synology/ztpkg-dsm6/PACKAGE_ICON.png rename to synology/dsm6-pkg/PACKAGE_ICON.png diff --git a/synology/ztpkg-dsm6/PACKAGE_ICON_256.png b/synology/dsm6-pkg/PACKAGE_ICON_256.png similarity index 100% rename from synology/ztpkg-dsm6/PACKAGE_ICON_256.png rename to synology/dsm6-pkg/PACKAGE_ICON_256.png diff --git a/synology/ztpkg-dsm6/scripts/postinst b/synology/dsm6-pkg/scripts/postinst similarity index 100% rename from synology/ztpkg-dsm6/scripts/postinst rename to synology/dsm6-pkg/scripts/postinst diff --git a/synology/ztpkg-dsm6/scripts/postuninst b/synology/dsm6-pkg/scripts/postuninst similarity index 100% rename from synology/ztpkg-dsm6/scripts/postuninst rename to synology/dsm6-pkg/scripts/postuninst diff --git a/synology/ztpkg-dsm6/scripts/postupgrade b/synology/dsm6-pkg/scripts/postupgrade similarity index 100% rename from synology/ztpkg-dsm6/scripts/postupgrade rename to synology/dsm6-pkg/scripts/postupgrade diff --git a/synology/ztpkg-dsm6/scripts/preinst b/synology/dsm6-pkg/scripts/preinst similarity index 100% rename from synology/ztpkg-dsm6/scripts/preinst rename to synology/dsm6-pkg/scripts/preinst diff --git a/synology/ztpkg-dsm6/scripts/preuninst b/synology/dsm6-pkg/scripts/preuninst similarity index 100% rename from synology/ztpkg-dsm6/scripts/preuninst rename to synology/dsm6-pkg/scripts/preuninst diff --git a/synology/ztpkg-dsm6/scripts/preupgrade b/synology/dsm6-pkg/scripts/preupgrade similarity index 100% rename from synology/ztpkg-dsm6/scripts/preupgrade rename to synology/dsm6-pkg/scripts/preupgrade diff --git a/synology/ztpkg-dsm6/service-setup.sh b/synology/dsm6-pkg/service-setup.sh similarity index 100% rename from synology/ztpkg-dsm6/service-setup.sh rename to synology/dsm6-pkg/service-setup.sh diff --git a/synology/ztpkg-dsm6/start-stop-status.sh b/synology/dsm6-pkg/start-stop-status.sh similarity index 97% rename from synology/ztpkg-dsm6/start-stop-status.sh rename to synology/dsm6-pkg/start-stop-status.sh index 701058924..9eea4a4bf 100755 --- a/synology/ztpkg-dsm6/start-stop-status.sh +++ b/synology/dsm6-pkg/start-stop-status.sh @@ -48,7 +48,7 @@ apply_routes() # Wait for ZT service to come online before attempting queries sleep 15 - # Loop until killed, every two minutes check for required routes and add if needed + # Loop until killed, check for required routes and add if needed while true do NETWORK_COUNT=$(zerotier-cli -j listnetworks | jq -r '. | length')