From f2827470bebc00355819d468cf7a42fc3012becb Mon Sep 17 00:00:00 2001 From: Joe Date: Thu, 26 Dec 2019 11:10:58 -0600 Subject: [PATCH 01/13] add version update tool --- tools/vupdate.sh | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100755 tools/vupdate.sh diff --git a/tools/vupdate.sh b/tools/vupdate.sh new file mode 100755 index 0000000..8711c7f --- /dev/null +++ b/tools/vupdate.sh @@ -0,0 +1,34 @@ +#!/bin/bash + +UserInput() { + read -r -p "$(echo -e 'New version: ')" version + read -e -r -p "$(echo -e 'File: ')" file +} + +SedFindReplace() { + local rex='([0-9]{1,}\.[0-9]{1,}\.[0-9]{1,})' + sed -i -E "s/$rex/$1/g" "$2" +} + +BashFindReplace() { + in=$2 + rex='[0-9]{1,}\.[0-9]{1,}\.[0-9]{1,}' + while [[ $in =~ $rex ]]; do + in=${BASH_REMATCH[1]}${BASH_REMATCH[2]} + done +} + +main() { + UserInput + SedFindReplace "$version" "$file" +# BashFindReplace "$version" "$file" +} + +while getopts a option +do + case "$option" in + a ) SedFindReplace "$2" "matrix-synapse_purge-remote-media.sh"; exit 0;; + esac +done + +main From bfff245079402a6f1371fb0edb0c200f9ebf73f0 Mon Sep 17 00:00:00 2001 From: Joe Date: Thu, 26 Dec 2019 15:56:43 -0600 Subject: [PATCH 02/13] remove until loop --- matrix-synapse_purge-remote-media.sh | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) mode change 100644 => 100755 matrix-synapse_purge-remote-media.sh diff --git a/matrix-synapse_purge-remote-media.sh b/matrix-synapse_purge-remote-media.sh old mode 100644 new mode 100755 index 7980327..c874398 --- a/matrix-synapse_purge-remote-media.sh +++ b/matrix-synapse_purge-remote-media.sh @@ -9,16 +9,9 @@ UserInput() { ExecutePurge() { echo 'Purging remote media, please wait.' - UntilLoop "https://$1/_synapse/admin/v1/purge_media_cache?before_ts=$2&access_token=$3" "error" - echo 'Error encountered. Please try again.' + curl -X POST "https://$1/_synapse/admin/v1/purge_media_cache?before_ts=$2&access_token=$3" --data '{}' } -UntilLoop() { - until curl -X POST "$1" --data '{}' \ - grep -m 1 "$2"; do - sleep 1 - done -} UnixTimeMs() { unix_time_ms="$(($(date -d "$1" +'%s') * 1000))" From 134638b021c8369d5b81dfd4cae0b35b7e28b584 Mon Sep 17 00:00:00 2001 From: Joe Date: Thu, 26 Dec 2019 16:03:51 -0600 Subject: [PATCH 03/13] update version --- matrix-synapse_purge-remote-media.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/matrix-synapse_purge-remote-media.sh b/matrix-synapse_purge-remote-media.sh index c874398..524c09f 100755 --- a/matrix-synapse_purge-remote-media.sh +++ b/matrix-synapse_purge-remote-media.sh @@ -1,5 +1,5 @@ #!/bin/bash -version=0.0.2 +version=0.0.3 UserInput() { read -r -p "$(echo -e 'Domain:\n')" domain From b336af93768de669cbed097bfc3ea2c8d4e9adbc Mon Sep 17 00:00:00 2001 From: Joe Date: Thu, 26 Dec 2019 16:30:11 -0600 Subject: [PATCH 04/13] use perl to validate domain --- matrix-synapse_purge-remote-media.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/matrix-synapse_purge-remote-media.sh b/matrix-synapse_purge-remote-media.sh index 524c09f..0057aed 100755 --- a/matrix-synapse_purge-remote-media.sh +++ b/matrix-synapse_purge-remote-media.sh @@ -17,6 +17,16 @@ UnixTimeMs() { unix_time_ms="$(($(date -d "$1" +'%s') * 1000))" } +DomainCheck() { + local result=$(perl -pe 's/(?=^.{4,253}$)(^((?!-)[a-zA-Z0-9-]{1,63}(? Date: Thu, 26 Dec 2019 16:30:55 -0600 Subject: [PATCH 05/13] bump version --- matrix-synapse_purge-remote-media.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/matrix-synapse_purge-remote-media.sh b/matrix-synapse_purge-remote-media.sh index 0057aed..d30e832 100755 --- a/matrix-synapse_purge-remote-media.sh +++ b/matrix-synapse_purge-remote-media.sh @@ -1,5 +1,5 @@ #!/bin/bash -version=0.0.3 +version=0.0.4 UserInput() { read -r -p "$(echo -e 'Domain:\n')" domain From fdc0635b7f63bd5c820cf7369bfa29e9f3d6ac98 Mon Sep 17 00:00:00 2001 From: Joe Date: Thu, 26 Dec 2019 16:31:31 -0600 Subject: [PATCH 06/13] correct mismatched quotes --- matrix-synapse_purge-remote-media.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/matrix-synapse_purge-remote-media.sh b/matrix-synapse_purge-remote-media.sh index d30e832..947fd4a 100755 --- a/matrix-synapse_purge-remote-media.sh +++ b/matrix-synapse_purge-remote-media.sh @@ -34,7 +34,7 @@ EchoVersion() { main() { EchoVersion; UserInput; - DomainCheck "$domain'; + DomainCheck "$domain"; UnixTimeMs "$time"; ExecutePurge "$domain" "$unix_time_ms" "$token" } From fb631b0c90da68934f155874eba5598c83a6bd1a Mon Sep 17 00:00:00 2001 From: Joe Date: Thu, 26 Dec 2019 16:31:58 -0600 Subject: [PATCH 07/13] bump version --- matrix-synapse_purge-remote-media.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/matrix-synapse_purge-remote-media.sh b/matrix-synapse_purge-remote-media.sh index 947fd4a..7ec2d4e 100755 --- a/matrix-synapse_purge-remote-media.sh +++ b/matrix-synapse_purge-remote-media.sh @@ -1,5 +1,5 @@ #!/bin/bash -version=0.0.4 +version=0.0.5 UserInput() { read -r -p "$(echo -e 'Domain:\n')" domain From d078f93dd895afc10cb90081f243bd9c0ce54161 Mon Sep 17 00:00:00 2001 From: Joe Date: Thu, 26 Dec 2019 16:43:17 -0600 Subject: [PATCH 08/13] hide token input --- matrix-synapse_purge-remote-media.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/matrix-synapse_purge-remote-media.sh b/matrix-synapse_purge-remote-media.sh index 7ec2d4e..6db850a 100755 --- a/matrix-synapse_purge-remote-media.sh +++ b/matrix-synapse_purge-remote-media.sh @@ -1,10 +1,10 @@ #!/bin/bash -version=0.0.5 +version=0.0.6 UserInput() { - read -r -p "$(echo -e 'Domain:\n')" domain - read -r -p "$(echo -e 'Time:\n')" time - read -r -p "$(echo -e 'Token:\n')" token + read -r -p "$(echo -e 'Domain:')" domain + read -r -p "$(echo -e 'Time:')" time + read -s -r -p "$(echo -e 'Token:')" token } ExecutePurge() { From 977637901a9d5732bf9aba0c251a21add257053c Mon Sep 17 00:00:00 2001 From: Joe Date: Thu, 26 Dec 2019 16:45:28 -0600 Subject: [PATCH 09/13] echo newline before domain validation error --- matrix-synapse_purge-remote-media.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/matrix-synapse_purge-remote-media.sh b/matrix-synapse_purge-remote-media.sh index 6db850a..e502495 100755 --- a/matrix-synapse_purge-remote-media.sh +++ b/matrix-synapse_purge-remote-media.sh @@ -22,7 +22,7 @@ DomainCheck() { if [ "$result" = "pass" ]; then return 0; else - echo -e 'Error: Not a valid domain.\n' + echo -e '\nError: Not a valid domain.\n' exit 1; fi } From 291c51b0b2856c60805b4e442605a9034e874f0b Mon Sep 17 00:00:00 2001 From: Joe Date: Thu, 26 Dec 2019 16:46:21 -0600 Subject: [PATCH 10/13] bump version --- matrix-synapse_purge-remote-media.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/matrix-synapse_purge-remote-media.sh b/matrix-synapse_purge-remote-media.sh index e502495..8ce5219 100755 --- a/matrix-synapse_purge-remote-media.sh +++ b/matrix-synapse_purge-remote-media.sh @@ -1,5 +1,5 @@ #!/bin/bash -version=0.0.6 +version=0.0.7 UserInput() { read -r -p "$(echo -e 'Domain:')" domain From 0d18d22e86dd48f39b4b8286a2d0d643f1f503b9 Mon Sep 17 00:00:00 2001 From: Joe Date: Thu, 26 Dec 2019 16:53:58 -0600 Subject: [PATCH 11/13] echo additional info on start --- matrix-synapse_purge-remote-media.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/matrix-synapse_purge-remote-media.sh b/matrix-synapse_purge-remote-media.sh index 8ce5219..6359f92 100755 --- a/matrix-synapse_purge-remote-media.sh +++ b/matrix-synapse_purge-remote-media.sh @@ -1,5 +1,8 @@ #!/bin/bash +name="Remote Media Killer" version=0.0.7 +author="Joe" +license="GNU GPLv3" UserInput() { read -r -p "$(echo -e 'Domain:')" domain @@ -27,12 +30,12 @@ DomainCheck() { fi } -EchoVersion() { - echo $version +EchoInfo() { + echo "$name $version - Licensed $license by $author" } main() { - EchoVersion; + EchoInfo; UserInput; DomainCheck "$domain"; UnixTimeMs "$time"; From 1f81837ed8725b85251a4df455a58d1ea12f8396 Mon Sep 17 00:00:00 2001 From: Joe Date: Thu, 26 Dec 2019 16:55:00 -0600 Subject: [PATCH 12/13] bump version and tag release --- matrix-synapse_purge-remote-media.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/matrix-synapse_purge-remote-media.sh b/matrix-synapse_purge-remote-media.sh index 6359f92..05bcda9 100755 --- a/matrix-synapse_purge-remote-media.sh +++ b/matrix-synapse_purge-remote-media.sh @@ -1,6 +1,6 @@ #!/bin/bash name="Remote Media Killer" -version=0.0.7 +version=1.0.0 author="Joe" license="GNU GPLv3" From 1caecfbff85dda45177737576086e601c3381845 Mon Sep 17 00:00:00 2001 From: Joe Date: Thu, 26 Dec 2019 16:55:00 -0600 Subject: [PATCH 13/13] update script name, bump version, and tag release --- matrix-synapse_purge-remote-media.sh => rmk.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename matrix-synapse_purge-remote-media.sh => rmk.sh (98%) diff --git a/matrix-synapse_purge-remote-media.sh b/rmk.sh similarity index 98% rename from matrix-synapse_purge-remote-media.sh rename to rmk.sh index 6359f92..05bcda9 100755 --- a/matrix-synapse_purge-remote-media.sh +++ b/rmk.sh @@ -1,6 +1,6 @@ #!/bin/bash name="Remote Media Killer" -version=0.0.7 +version=1.0.0 author="Joe" license="GNU GPLv3"