From 7010f8024023a3c8e2f8bd1335b024e8ce507fa4 Mon Sep 17 00:00:00 2001 From: lapinou Date: Mon, 29 Apr 2024 00:54:10 +0200 Subject: [PATCH 1/2] Fix username-anarchy --- sources/install/package_wordlists.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sources/install/package_wordlists.sh b/sources/install/package_wordlists.sh index ed5f7695..56b5945b 100644 --- a/sources/install/package_wordlists.sh +++ b/sources/install/package_wordlists.sh @@ -77,6 +77,9 @@ function install_pass_station() { function install_username-anarchy() { colorecho "Installing Username-Anarchy" git -C /opt/tools/ clone --depth 1 https://github.com/urbanadventurer/username-anarchy + cd /opt/tools/username-anarchy || exit + git fetch origin "pull/3/head:pull/3" + git merge --strategy-option theirs --no-edit "pull/3" add-aliases username-anarchy add-history username-anarchy add-test-command "username-anarchy --help" From f4eb6dcb2699e9ad8de585d8d058e0dc3c0e83ee Mon Sep 17 00:00:00 2001 From: lapinou Date: Tue, 30 Apr 2024 19:28:09 +0200 Subject: [PATCH 2/2] Update package_wordlists.sh --- sources/install/package_wordlists.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/sources/install/package_wordlists.sh b/sources/install/package_wordlists.sh index 56b5945b..d2a9849f 100644 --- a/sources/install/package_wordlists.sh +++ b/sources/install/package_wordlists.sh @@ -78,8 +78,16 @@ function install_username-anarchy() { colorecho "Installing Username-Anarchy" git -C /opt/tools/ clone --depth 1 https://github.com/urbanadventurer/username-anarchy cd /opt/tools/username-anarchy || exit - git fetch origin "pull/3/head:pull/3" - git merge --strategy-option theirs --no-edit "pull/3" + # https://github.com/urbanadventurer/username-anarchy/pull/3 + local temp_fix_limit="2025-04-01" + if [[ "$(date +%Y%m%d)" -gt "$(date -d $temp_fix_limit +%Y%m%d)" ]]; then + criticalecho "Temp fix expired. Exiting." + else + git config --local user.email "local" + git config --local user.name "local" + local prs=("3") + for pr in "${prs[@]}"; do git fetch origin "pull/$pr/head:pull/$pr" && git merge --strategy-option theirs --no-edit "pull/$pr"; done + fi add-aliases username-anarchy add-history username-anarchy add-test-command "username-anarchy --help"