From 55ab60b6ea6771d6a872e61fd807a4950b54d65b Mon Sep 17 00:00:00 2001 From: rpelmegov Date: Wed, 14 Dec 2022 14:09:56 +0300 Subject: [PATCH 1/5] Update export_src.sh MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit issue-276 Перед экспортом репозитория проверить файлы на невалидные символы в именах --- scripts/export_src.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/export_src.sh b/scripts/export_src.sh index 11a52902..3c3d175d 100755 --- a/scripts/export_src.sh +++ b/scripts/export_src.sh @@ -46,4 +46,8 @@ done find . -name ".git*" -print0 | xargs -0 rm -rf zip -r -q ${SRC_FOLDER_NAME}.zip . +find . -name "*[<>:\\|?*]*" +./ProjectName/Extensions/Foundation/Int64? +./ProjectName/Extensions/Foundation/Int64?/Int64?+Extensions.swift + open . From 45fbc845783655763bc3de09f68ce3ba7c2d99df Mon Sep 17 00:00:00 2001 From: rpelmegov Date: Fri, 13 Jan 2023 06:37:01 +0300 Subject: [PATCH 2/5] Update export_src.sh --- scripts/export_src.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/export_src.sh b/scripts/export_src.sh index 3c3d175d..aaea2058 100755 --- a/scripts/export_src.sh +++ b/scripts/export_src.sh @@ -46,8 +46,10 @@ done find . -name ".git*" -print0 | xargs -0 rm -rf zip -r -q ${SRC_FOLDER_NAME}.zip . -find . -name "*[<>:\\|?*]*" -./ProjectName/Extensions/Foundation/Int64? -./ProjectName/Extensions/Foundation/Int64?/Int64?+Extensions.swift +if find . -name "*[<>:\\|?*]*" | xargs -I %s echo "in path %s" | xargs -0 echo "Invalid characters [<>:\|?*]" | grep . +then + echo "Abort the script" + exit +fi open . From f0bbbb99292adbbc81389762ffd94e9cce0682ee Mon Sep 17 00:00:00 2001 From: rpelmegov Date: Mon, 30 Jan 2023 07:14:20 +0300 Subject: [PATCH 3/5] issue-276 add bad path alarm --- scripts/export_src.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/scripts/export_src.sh b/scripts/export_src.sh index aaea2058..275c6bf7 100755 --- a/scripts/export_src.sh +++ b/scripts/export_src.sh @@ -46,10 +46,15 @@ done find . -name ".git*" -print0 | xargs -0 rm -rf zip -r -q ${SRC_FOLDER_NAME}.zip . -if find . -name "*[<>:\\|?*]*" | xargs -I %s echo "in path %s" | xargs -0 echo "Invalid characters [<>:\|?*]" | grep . +IFS="\n" +ERR_PATH_ARR=($(find . -name "*[<>:\\|?*]*" | xargs -I %s echo "- %s")) +unset IFS + +if [ ${#ERR_PATH_ARR[@]} != 0 ] then - echo "Abort the script" - exit + echo "Export aborted! Invalid characters found in file or directories name(s):" + printf "%s\n" "${ERR_PATH_ARR[@]}" + exit fi open . From 4b5ee64737c10640bf70b73d533cd2f2d0d5a380 Mon Sep 17 00:00:00 2001 From: rpelmegov Date: Mon, 6 Feb 2023 14:39:04 +0300 Subject: [PATCH 4/5] Update export_src.sh --- scripts/export_src.sh | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/scripts/export_src.sh b/scripts/export_src.sh index 275c6bf7..26395396 100755 --- a/scripts/export_src.sh +++ b/scripts/export_src.sh @@ -46,15 +46,18 @@ done find . -name ".git*" -print0 | xargs -0 rm -rf zip -r -q ${SRC_FOLDER_NAME}.zip . -IFS="\n" -ERR_PATH_ARR=($(find . -name "*[<>:\\|?*]*" | xargs -I %s echo "- %s")) -unset IFS - -if [ ${#ERR_PATH_ARR[@]} != 0 ] -then - echo "Export aborted! Invalid characters found in file or directories name(s):" - printf "%s\n" "${ERR_PATH_ARR[@]}" - exit +read_err_path() { + read -d $'\0' err_path +} + +find . -name "*[<>:\\|?*]*" -print0 | +if read_err_path; then + echo "Export aborted! Invalid characters found in file or directories name(s):\n- $err_path" + while read_err_path + do + echo "- $err_path" + done + exit fi open . From 302530f3c2e04da5fdae93c0ff1e5687bdce7bf0 Mon Sep 17 00:00:00 2001 From: rpelmegov Date: Mon, 27 Feb 2023 05:52:11 +0300 Subject: [PATCH 5/5] Update export_src.sh --- scripts/export_src.sh | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/scripts/export_src.sh b/scripts/export_src.sh index 26395396..6e8680f1 100755 --- a/scripts/export_src.sh +++ b/scripts/export_src.sh @@ -46,18 +46,10 @@ done find . -name ".git*" -print0 | xargs -0 rm -rf zip -r -q ${SRC_FOLDER_NAME}.zip . -read_err_path() { - read -d $'\0' err_path -} - -find . -name "*[<>:\\|?*]*" -print0 | -if read_err_path; then - echo "Export aborted! Invalid characters found in file or directories name(s):\n- $err_path" - while read_err_path - do - echo "- $err_path" - done - exit +ERR_PATHS=$(find . -name "*[<>:\\|?*]*" | xargs -I %s echo "- %s") +if [ "$ERR_PATHS" ]; then + echo "Export aborted! Invalid characters found in file or directories name(s):\n$ERR_PATHS" + exit 1 fi open .