From 97b175843f82632c11845aa1f1a1ec3afa1446ec Mon Sep 17 00:00:00 2001 From: P3TERX <25927179+P3TERX@users.noreply.github.com> Date: Tue, 14 Sep 2021 14:42:04 +0800 Subject: [PATCH] Version number revision --- LICENSE | 2 +- aria2.conf | 10 +++++----- clean.sh | 25 ++++++++++++++++++++----- core | 27 +++++++++++++++++++++------ delete.sh | 25 ++++++++++++++++++++----- move.sh | 25 ++++++++++++++++++++----- rclone.env | 13 ++++--------- script.conf | 7 +------ tracker.sh | 27 +++++++++++++++++++++------ upload.sh | 25 ++++++++++++++++++++----- 10 files changed, 133 insertions(+), 53 deletions(-) diff --git a/LICENSE b/LICENSE index 5206e34..969207d 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2018-2020 P3TERX +Copyright (c) 2018-2021 P3TERX Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/aria2.conf b/aria2.conf index 4f4b7f3..94c94d8 100644 --- a/aria2.conf +++ b/aria2.conf @@ -1,14 +1,14 @@ # -# Copyright (c) 2018-2020 P3TERX -# -# This is free software, licensed under the MIT License. -# See /LICENSE for more information. -# # https://github.com/P3TERX/aria2.conf # File name：aria2.conf # Description: Awesome Aria2 configuration file # Version: 2020.12.28 # +# Copyright (c) 2018-2021 P3TERX +# +# This is free software, licensed under the MIT License. +# See /LICENSE for more information. +# ## 文件保存设置 ## diff --git a/clean.sh b/clean.sh index 0602de5..80750c2 100755 --- a/clean.sh +++ b/clean.sh @@ -1,15 +1,30 @@ #!/usr/bin/env bash # -# Copyright (c) 2018-2020 P3TERX -# -# This is free software, licensed under the MIT License. -# See /LICENSE for more information. -# # https://github.com/P3TERX/aria2.conf # File name：clean.sh # Description: Remove redundant files after Aria2 download is complete # Version: 3.0 # +# Copyright (c) 2018-2021 P3TERX +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. +# CHECK_CORE_FILE() { CORE_FILE="$(dirname $0)/core" diff --git a/core b/core index 828571e..7ac0f3e 100644 --- a/core +++ b/core @@ -1,13 +1,28 @@ # -# Copyright (c) 2018-2020 P3TERX -# -# This is free software, licensed under the MIT License. -# See /LICENSE for more information. -# # https://github.com/P3TERX/aria2.conf # File name：core # Description: Aria2 additional function script core file -# Version: 3.0 +# Version: 3.3 +# +# Copyright (c) 2018-2021 P3TERX +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. # TASK_GID=$1 diff --git a/delete.sh b/delete.sh index 0aa5619..a1e4790 100755 --- a/delete.sh +++ b/delete.sh @@ -1,15 +1,30 @@ #!/usr/bin/env bash # -# Copyright (c) 2018-2020 P3TERX -# -# This is free software, licensed under the MIT License. -# See /LICENSE for more information. -# # https://github.com/P3TERX/aria2.conf # File name：delete.sh # Description: Delete files after Aria2 download error or task removed # Version: 3.0 # +# Copyright (c) 2018-2021 P3TERX +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. +# CHECK_CORE_FILE() { CORE_FILE="$(dirname $0)/core" diff --git a/move.sh b/move.sh index ee1e961..2702442 100755 --- a/move.sh +++ b/move.sh @@ -1,15 +1,30 @@ #!/usr/bin/env bash # -# Copyright (c) 2018-2020 P3TERX -# -# This is free software, licensed under the MIT License. -# See /LICENSE for more information. -# # https://github.com/P3TERX/aria2.conf # File name：move.sh # Description: Move files after Aria2 download is complete # Version: 3.0 # +# Copyright (c) 2018-2021 P3TERX +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. +# CHECK_CORE_FILE() { CORE_FILE="$(dirname $0)/core" diff --git a/rclone.env b/rclone.env index e154a4a..4a41e78 100644 --- a/rclone.env +++ b/rclone.env @@ -1,14 +1,12 @@ # -# Copyright (c) 2018-2020 P3TERX -# -# This is free software, licensed under the MIT License. -# See /LICENSE for more information. -# # https://github.com/P3TERX/aria2.conf # File name：rclone.env -# Description: Rclone environment variables file +# Description: RCLONE environment variables file # Version: 2020.11.26 # +# For more information on RCLONE environment variables： +# https://rclone.org/docs/#environment-variables +# # RCLONE 配置文件路径 #RCLONE_CONFIG=$HOME/.config/rclone/rclone.conf @@ -41,6 +39,3 @@ RCLONE_RETRIES_SLEEP=10s # RCLONE 代理设置 #HTTP_PROXY=localhost:1080 #HTTPS_PROXY=$HTTP_PROXY - -# More details -# https://rclone.org/docs/#environment-variables diff --git a/script.conf b/script.conf index 86299a8..c528cca 100644 --- a/script.conf +++ b/script.conf @@ -1,13 +1,8 @@ # -# Copyright (c) 2018-2020 P3TERX -# -# This is free software, licensed under the MIT License. -# See /LICENSE for more information. -# # https://github.com/P3TERX/aria2.conf # File name：script.conf # Description: Aria2 additional function script configuration file -# Version: 2020.08.08 +# Version: 2021.07.04 # ## 文件上传设置(upload.sh) ## diff --git a/tracker.sh b/tracker.sh index 1555698..7c6882a 100755 --- a/tracker.sh +++ b/tracker.sh @@ -1,14 +1,29 @@ #!/usr/bin/env bash # -# Copyright (c) 2018-2020 P3TERX -# -# This is free software, licensed under the MIT License. -# See /LICENSE for more information. -# # https://github.com/P3TERX/aria2.conf # File name：tracker.sh # Description: Get BT trackers and add to Aria2 -# Version: 3.0 +# Version: 3.1 +# +# Copyright (c) 2018-2021 P3TERX +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. # # BT tracker is provided by the following project. # https://github.com/XIU2/TrackersListCollection diff --git a/upload.sh b/upload.sh index cb55f11..b3a214c 100755 --- a/upload.sh +++ b/upload.sh @@ -1,15 +1,30 @@ #!/usr/bin/env bash # -# Copyright (c) 2018-2020 P3TERX -# -# This is free software, licensed under the MIT License. -# See /LICENSE for more information. -# # https://github.com/P3TERX/aria2.conf # File name：upload.sh # Description: Use Rclone to upload files after Aria2 download is complete # Version: 3.1 # +# Copyright (c) 2018-2021 P3TERX +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. +# CHECK_CORE_FILE() { CORE_FILE="$(dirname $0)/core"