forked from coolsnowwolf/lede
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[bot] AutoMerging: merge all upstream's changes:
* https://github.com/coolsnowwolf/lede: treewide: adjust sysupgrade script (coolsnowwolf#4720) Rclone-OpenWRT: upgrade (coolsnowwolf#4737)
- Loading branch information
Showing
10 changed files
with
232 additions
and
61 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,10 +10,10 @@ | |
| include $(TOPDIR)/rules.mk | ||
|
|
||
| LUCI_TITLE:=LuCI support for Rclone | ||
| LUCI_DEPENDS:=+rclone +rclone-webui-react +fuse-utils | ||
| LUCI_DEPENDS:=+rclone +rclone-webui-react +fuse-utils +rclone-ng | ||
| LUCI_PKGARCH:=all | ||
| PKG_NAME:=luci-app-rclone | ||
| PKG_VERSION:=1.3.21 | ||
| PKG_VERSION:=1.4.0 | ||
| PKG_RELEASE:=1 | ||
| PKG_LICENSE:=GPLv3.0+ | ||
| PKG_MAINTAINER:=ElonH <[email protected]> | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| #!/bin/bash /etc/rc.common | ||
| #!/bin/sh /etc/rc.common | ||
| # Copyright (C) 2019 ElonH <[email protected]> | ||
|
|
||
| USE_PROCD=1 | ||
|
|
@@ -32,6 +32,9 @@ init_config() { | |
|
|
||
| [ -f "$config_path" ] || touch "$config_path" | ||
|
|
||
| [ -d "/lib/upgrade/keep.d" ] || mkdir -p /lib/upgrade/keep.d/luci-app-rclone 2>/dev/null | ||
| echo "$config_path" > /lib/upgrade/keep.d/luci-app-rclone | ||
|
|
||
| log_dir=${log_path%/*} | ||
| [ -d "$log_dir" ] || mkdir -p "$log_dir" 2>/dev/null && echo /dev/null > "$log_path" | ||
|
|
||
|
|
@@ -81,8 +84,8 @@ start_service() { | |
| procd_append_param command "--rc-allow-origin=*" | ||
| procd_append_param command "--log-file=${log_path}" | ||
| if [[ "${proxy_enable}" == "1" ]]; then | ||
| procd_set_param env all_proxy="$proxy_addr" https_proxy="$proxy_addr" http_proxy="$proxy_addr" | ||
| procd_set_param env ALL_PROXY="$proxy_addr" HTTPS_PROXY="$proxy_addr" HTTP_PROXY="$proxy_addr" | ||
| procd_set_param env all_proxy="$proxy_addr" https_proxy="$proxy_addr" http_proxy="$proxy_addr" | ||
| procd_append_param env ALL_PROXY="$proxy_addr" HTTPS_PROXY="$proxy_addr" HTTP_PROXY="$proxy_addr" | ||
| fi | ||
| procd_set_param stdout 1 | ||
| procd_set_param stderr 1 | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| #### | ||
| # File: /rclone-ng/Makefile | ||
| # Project: Rclone-OpenWrt | ||
| # File Created: Friday, 5th June 2020 12:37:26 am | ||
| # Author: ElonH[EH]([email protected]) | ||
| # License: GNU General Public License v3.0 or later(http://www.gnu.org/licenses/gpl-3.0-standalone.html) | ||
| # Copyright (C) 2020 [ElonH] | ||
| #### | ||
|
|
||
| include $(TOPDIR)/rules.mk | ||
|
|
||
| PKG_NAME:=rclone-ng | ||
| PKG_VERSION:=0.2.4 | ||
| PKG_RELEASE:=1 | ||
|
|
||
|
|
||
| PKG_LICENSE:=GPLv3 | ||
| PKG_MAINTAINER:=ElonH <[email protected]> | ||
|
|
||
| include $(INCLUDE_DIR)/package.mk | ||
|
|
||
| PKG_SOURCE:=RcloneNg-v$(PKG_VERSION).tar.gz | ||
| PKG_SOURCE_URL:=https://github.com/ElonH/RcloneNg/releases/download/v$(PKG_VERSION)/ | ||
| PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) | ||
| PKG_HASH:=3090a713253b17bfbb4d6a69b4b55b81d69e1768cf56d3abca8631e4a35f270b | ||
|
|
||
| define Package/$(PKG_NAME) | ||
| SECTION:=net | ||
| CATEGORY:=Network | ||
| SUBMENU:=File Transfer | ||
| SUBMENU:=Cloud Manager | ||
| TITLE:=An angular web application for rclone | ||
| URL:=https://github.com/ElonH/RcloneNg | ||
| PKGARCH:=all | ||
| endef | ||
|
|
||
| define Package/$(PKG_NAME)/description | ||
| An angular web application for rclone | ||
| endef | ||
|
|
||
| define Build/Prepare | ||
| mkdir -vp $(PKG_BUILD_DIR) | ||
| tar -xzf $(DL_DIR)/$(PKG_SOURCE) -C $(PKG_BUILD_DIR) | ||
| endef | ||
|
|
||
| define Build/Configure | ||
| endef | ||
|
|
||
| define Build/Compile | ||
| echo "$(PKG_NAME) Compile Skiped!" | ||
| endef | ||
|
|
||
| define Package/$(PKG_NAME)/install | ||
| $(INSTALL_DIR) $(1)/www | ||
| $(CP) $(PKG_BUILD_DIR)/RcloneNg $(1)/www | ||
| endef | ||
|
|
||
| $(eval $(call BuildPackage,$(PKG_NAME))) |
Oops, something went wrong.