From bc4209dbae4d1a5e934420d4d60d78e5403f42a0 Mon Sep 17 00:00:00 2001 From: silver Date: Sat, 2 Nov 2024 22:27:44 +0100 Subject: [PATCH] bump version to V4 --- .gitignore | 6 ++++-- README.md | 2 +- bin/gltool.sh | 3 ++- customizer.sh | 4 ++-- docker-build.sh | 6 +++--- docker-compose.yml | 4 ++-- docker-run.sh | 6 +++--- 7 files changed, 17 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 99a15d2..3b7aef7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,12 @@ /glftpd /glftpd/ /archive/ -src/pyspy-*.sha512sum -src/pyspy-*.tar.gz .env *.bak *.crt *.key *.swp +pyspy-*.sha512sum +pyspy-*.tar.gz +pywho-*.sha512sum +pywho-*.tar.gz diff --git a/README.md b/README.md index da468f1..9ceb712 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# docker-glftpd (v3) +# docker-glftpd (v4) [![Docker](https://github.com/silv3rr/docker-glftpd/actions/workflows/docker.yml/badge.svg)](https://github.com/silv3rr/docker-glftpd/actions/workflows/docker.yml) diff --git a/bin/gltool.sh b/bin/gltool.sh index 56379c2..1936d30 100755 --- a/bin/gltool.sh +++ b/bin/gltool.sh @@ -960,7 +960,8 @@ func_delflag() { done sed "s/^FLAGS .*/FLAGS $NEW_FLAGS/" "$USERFILE" > "$USERFILE.tmp" || { echo "ERROR: changing flags"; exit 1; } func_update_userfile - func_logmsg "deleted flags \"$FLAGS\" from \"$USERNAME\"" + #func_logmsg "deleted flags \"$FLAGS\" from \"$USERNAME\"" + func_logmsg "changed flags to \"$NEW_FLAGS\" for \"$USERNAME\"" } # ---------------------------------------------- diff --git a/customizer.sh b/customizer.sh index a3c868d..3618e72 100755 --- a/customizer.sh +++ b/customizer.sh @@ -1,5 +1,5 @@ #!/bin/bash - +VERSION=V4 ################################## ################################ #### # ## # >> DOCKER-GLFTPD-CUSTOMIZER ################################## ################################ #### # ## @@ -14,7 +14,7 @@ RESET=1 echo "----------------------------------------------" -echo "DOCKER-GLFTPD-CUSTOMIZER-V3" +echo "DOCKER-GLFTPD-CUSTOMIZER-${VERSION}" echo "----------------------------------------------" echo "* Adding customizations to config files" diff --git a/docker-build.sh b/docker-build.sh index e80d746..d811fce 100755 --- a/docker-build.sh +++ b/docker-build.sh @@ -1,7 +1,7 @@ #!/bin/bash - +VERSION=V4 ################################## ################################ #### # ## -# >> DOCKER-BUILD-GLFTPD-V3 +# >> DOCKER-BUILD-GLFTPD ################################## ################################ #### # ## # # BUILD-TIME VARIABLES: @@ -34,7 +34,7 @@ GLFTPD_VER="$( basename "$GLFTPD_URL" | sed 's/^glftpd.*-\([0-9\.]\+[a-z]\?\)_.* ARGS+="$*" echo "----------------------------------------------" -echo "DOCKER-GLFTPD-BUILD-V3" +echo "DOCKER-GLFTPD-BUILD-${VERSION}" echo "----------------------------------------------" if [ "${BUILD_GLFTPD:-1}" -eq 1 ]; then diff --git a/docker-compose.yml b/docker-compose.yml index 140ea6e..e5c1d44 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,10 +1,10 @@ --- ################################################################### #### # ## -# >> DOCKER-COMPOSE-GLFTPD-V3 +# >> DOCKER-COMPOSE-GLFTPD-V4 ################################################################### #### # ## # build args: # environment options: -# +# #### # uncomment any volumes to mount dirs from host # optionally uncomment args e.g. additional ftp ports ################################################################### #### # ## diff --git a/docker-run.sh b/docker-run.sh index 7d63a7e..3335b0f 100755 --- a/docker-run.sh +++ b/docker-run.sh @@ -1,7 +1,7 @@ #!/bin/bash - +VERSION=V4 ################################## ################################ #### # ## -# >> DOCKER-RUN-GLFTPD-V3 +# >> DOCKER-RUN-GLFTPD ################################## ################################ #### # ## # # ENVIRONMENT VARIABLES: @@ -94,7 +94,7 @@ else fi echo "----------------------------------------------" -echo "DOCKER-GLFTPD-RUN-V3" +echo "DOCKER-GLFTPD-RUN-${VERSION}" echo "----------------------------------------------" # set runtime docker args