From 94c179f6662c521458f00f35db94867ea3b4776d Mon Sep 17 00:00:00 2001 From: Maxim Sorokin Date: Wed, 15 Jan 2020 13:52:43 +0300 Subject: [PATCH 1/5] added folder and file to delete capabilities for download_file.sh --- xcode/aux_scripts/download_file.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/xcode/aux_scripts/download_file.sh b/xcode/aux_scripts/download_file.sh index 9bfcbc7..52bdce7 100755 --- a/xcode/aux_scripts/download_file.sh +++ b/xcode/aux_scripts/download_file.sh @@ -1,9 +1,21 @@ file_name=$1 file_link=$2 +folder_to_delete=$3 +file_to_delete=$4 folder="Downloads" file_path="./${folder}/${file_name}" +# remove folder and all files it +if [ -e ${folder_to_delete} ]; then + rm -rf ${folder_to_delete} +fi + +# remove some file +if [ -e ${file_to_delete} ]; then + rm ${file_to_delete} +fi + # make folder if not exist if ! [ -e ${folder} ]; then mkdir ${folder} From 1205e6c5bb468e581f9ea5a92467b8cf7d80e3a5 Mon Sep 17 00:00:00 2001 From: Maxim Sorokin Date: Wed, 15 Jan 2020 16:27:02 +0300 Subject: [PATCH 2/5] added folder and file to delete capabilities for download_file.sh --- xcode/aux_scripts/download_file.sh | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/xcode/aux_scripts/download_file.sh b/xcode/aux_scripts/download_file.sh index 52bdce7..d3822a4 100755 --- a/xcode/aux_scripts/download_file.sh +++ b/xcode/aux_scripts/download_file.sh @@ -1,19 +1,19 @@ file_name=$1 file_link=$2 -folder_to_delete=$3 -file_to_delete=$4 +folder=$3 +flag_of_delete=$4 -folder="Downloads" -file_path="./${folder}/${file_name}" +key_of_delete="--remove-cached" +default_folder="Downloads" -# remove folder and all files it -if [ -e ${folder_to_delete} ]; then - rm -rf ${folder_to_delete} +if ! [ -n "$folder" ]; then + folder="${default_folder}" fi -# remove some file -if [ -e ${file_to_delete} ]; then - rm ${file_to_delete} +file_path="./${folder}/${file_name}" + +if [[ ${flag_of_delete} = ${key_of_delete} ]]; then + rm ${file_path} fi # make folder if not exist From 618547c0806a6bff58cdca791f8ef3983c1a26b7 Mon Sep 17 00:00:00 2001 From: Maxim Sorokin Date: Wed, 15 Jan 2020 16:42:58 +0300 Subject: [PATCH 3/5] added folder and file to delete capabilities for download_file.sh --- xcode/aux_scripts/download_file.sh | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/xcode/aux_scripts/download_file.sh b/xcode/aux_scripts/download_file.sh index d3822a4..5f6f2c7 100755 --- a/xcode/aux_scripts/download_file.sh +++ b/xcode/aux_scripts/download_file.sh @@ -1,15 +1,8 @@ file_name=$1 file_link=$2 -folder=$3 +readonly folder=${3:-"Downloads"} flag_of_delete=$4 - -key_of_delete="--remove-cached" -default_folder="Downloads" - -if ! [ -n "$folder" ]; then - folder="${default_folder}" -fi - +readonly key_of_delete="--remove-cached" file_path="./${folder}/${file_name}" if [[ ${flag_of_delete} = ${key_of_delete} ]]; then @@ -18,7 +11,7 @@ fi # make folder if not exist if ! [ -e ${folder} ]; then - mkdir ${folder} + mkdir -p ${folder} fi # download file if not downloaded From 566e165d3f89e5cbe1f9c02e3565445ce45e52e9 Mon Sep 17 00:00:00 2001 From: Maxim Sorokin Date: Wed, 15 Jan 2020 17:02:56 +0300 Subject: [PATCH 4/5] added folder and file to delete capabilities for download_file.sh --- xcode/aux_scripts/download_file.sh | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/xcode/aux_scripts/download_file.sh b/xcode/aux_scripts/download_file.sh index 5f6f2c7..d6bc935 100755 --- a/xcode/aux_scripts/download_file.sh +++ b/xcode/aux_scripts/download_file.sh @@ -1,8 +1,20 @@ file_name=$1 file_link=$2 -readonly folder=${3:-"Downloads"} +folder=$3 flag_of_delete=$4 + readonly key_of_delete="--remove-cached" +readonly default_folder="Downloads" + +if [[ ${folder} = ${key_of_delete} ]]; then + folder="${default_folder}" + flag_of_delete="${key_of_delete}" +fi + +if ! [ -n "$folder" ]; then + folder="${default_folder}" +fi + file_path="./${folder}/${file_name}" if [[ ${flag_of_delete} = ${key_of_delete} ]]; then From 75bda07282e6a2409d2bfa033365d96a9f3f0886 Mon Sep 17 00:00:00 2001 From: Maxim Sorokin Date: Wed, 15 Jan 2020 17:11:24 +0300 Subject: [PATCH 5/5] added folder and file to delete capabilities for download_file.sh --- xcode/aux_scripts/download_file.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xcode/aux_scripts/download_file.sh b/xcode/aux_scripts/download_file.sh index d6bc935..55d74ba 100755 --- a/xcode/aux_scripts/download_file.sh +++ b/xcode/aux_scripts/download_file.sh @@ -4,7 +4,7 @@ folder=$3 flag_of_delete=$4 readonly key_of_delete="--remove-cached" -readonly default_folder="Downloads" +readonly default_folder="./Downloads" if [[ ${folder} = ${key_of_delete} ]]; then folder="${default_folder}" @@ -15,7 +15,7 @@ if ! [ -n "$folder" ]; then folder="${default_folder}" fi -file_path="./${folder}/${file_name}" +file_path="${folder}/${file_name}" if [[ ${flag_of_delete} = ${key_of_delete} ]]; then rm ${file_path}