From d7464b72c33d90401711479e492994ee850bd4e0 Mon Sep 17 00:00:00 2001 From: Justin Emter Date: Fri, 22 Dec 2017 14:29:49 -0800 Subject: [PATCH] Added increment symbol option to new sort logic, also made all scripts executable from the get go. --- multi-channel-bash-scripts/channeldown.sh | 2 +- multi-channel-bash-scripts/channelup.sh | 2 +- multi-channel-bash-scripts/generate-channels-daily-schedules.sh | 2 +- multi-channel-bash-scripts/manual.sh | 2 +- multi-channel-bash-scripts/stop-all-channels.sh | 2 +- multi-channel-bash-scripts/update-channels-from-git.sh | 2 +- multi-channel-bash-scripts/updatechannels.sh | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) mode change 100644 => 100755 multi-channel-bash-scripts/channeldown.sh mode change 100644 => 100755 multi-channel-bash-scripts/channelup.sh mode change 100644 => 100755 multi-channel-bash-scripts/generate-channels-daily-schedules.sh mode change 100644 => 100755 multi-channel-bash-scripts/manual.sh mode change 100644 => 100755 multi-channel-bash-scripts/update-channels-from-git.sh mode change 100644 => 100755 multi-channel-bash-scripts/updatechannels.sh diff --git a/multi-channel-bash-scripts/channeldown.sh b/multi-channel-bash-scripts/channeldown.sh old mode 100644 new mode 100755 index f7cec21..5adfc9f --- a/multi-channel-bash-scripts/channeldown.sh +++ b/multi-channel-bash-scripts/channeldown.sh @@ -38,7 +38,7 @@ CHANNEL_DIR_INCREMENT_SYMBOL="_" FIRST_RUN=false # Scan the dir to see how many channels there are, store them in an arr. -CHANNEL_DIR_ARR=( $(find . -maxdepth 1 -type d -name '*'"$CHANNEL_DIR_INCREMENT_SYMBOL"'[[:digit:]]*' -printf "%P\n" | sort -t_ -n) ) +CHANNEL_DIR_ARR=( $(find . -maxdepth 1 -type d -name '*'"$CHANNEL_DIR_INCREMENT_SYMBOL"'[[:digit:]]*' -printf "%P\n" | sort -t"$CHANNEL_DIR_INCREMENT_SYMBOL" -n) ) # If the previous channel txt file doesn't exist already create it (first run?) if [ ! -e "$OUTPUT_PREV_CHANNEL_PATH/$OUTPUT_PREV_CHANNEL_FILE" ]; then diff --git a/multi-channel-bash-scripts/channelup.sh b/multi-channel-bash-scripts/channelup.sh old mode 100644 new mode 100755 index 3a6fd27..8a67c74 --- a/multi-channel-bash-scripts/channelup.sh +++ b/multi-channel-bash-scripts/channelup.sh @@ -49,7 +49,7 @@ fi # If the file exists b # Scan the dir to see how many channels there are, store them in an arr. -CHANNEL_DIR_ARR=( $(find . -maxdepth 1 -type d -name '*'"$CHANNEL_DIR_INCREMENT_SYMBOL"'[[:digit:]]*' -printf "%P\n" | sort -t_ -n) ) +CHANNEL_DIR_ARR=( $(find . -maxdepth 1 -type d -name '*'"$CHANNEL_DIR_INCREMENT_SYMBOL"'[[:digit:]]*' -printf "%P\n" | sort -t"$CHANNEL_DIR_INCREMENT_SYMBOL" -n) ) # If this script see's there are multiple channels, # then read file, get prevchannel, increment, and trigger next channel: diff --git a/multi-channel-bash-scripts/generate-channels-daily-schedules.sh b/multi-channel-bash-scripts/generate-channels-daily-schedules.sh old mode 100644 new mode 100755 index 4056cd5..c2bc354 --- a/multi-channel-bash-scripts/generate-channels-daily-schedules.sh +++ b/multi-channel-bash-scripts/generate-channels-daily-schedules.sh @@ -37,7 +37,7 @@ if [ -d "$VIRTUAL_ENV_DIR" ]; then fi # Scan the dir to see how many channels there are, store them in an arr. -CHANNEL_DIR_ARR=( $(find . -maxdepth 1 -type d -name '*'"$CHANNEL_DIR_INCREMENT_SYMBOL"'[[:digit:]]*' -printf "%P\n" | sort -t_ -n) ) +CHANNEL_DIR_ARR=( $(find . -maxdepth 1 -type d -name '*'"$CHANNEL_DIR_INCREMENT_SYMBOL"'[[:digit:]]*' -printf "%P\n" | sort -t"$CHANNEL_DIR_INCREMENT_SYMBOL" -n) ) # If this script see's there are multiple channels, # then loop through each channel and run the daily schedule generator diff --git a/multi-channel-bash-scripts/manual.sh b/multi-channel-bash-scripts/manual.sh old mode 100644 new mode 100755 index 58e2818..5345e5d --- a/multi-channel-bash-scripts/manual.sh +++ b/multi-channel-bash-scripts/manual.sh @@ -42,7 +42,7 @@ CHANNEL_DIR_INCREMENT_SYMBOL="_" FIRST_RUN=false # Scan the dir to see how many channels there are, store them in an arr. -CHANNEL_DIR_ARR=( $(find . -maxdepth 1 -type d -name '*'"$CHANNEL_DIR_INCREMENT_SYMBOL"'[[:digit:]]*' -printf "%P\n" | sort -t_ -n) ) +CHANNEL_DIR_ARR=( $(find . -maxdepth 1 -type d -name '*'"$CHANNEL_DIR_INCREMENT_SYMBOL"'[[:digit:]]*' -printf "%P\n" | sort -t"$CHANNEL_DIR_INCREMENT_SYMBOL" -n) ) # If the previous channel txt file doesn't exist already create it (first run?) if [ ! -e "$OUTPUT_PREV_CHANNEL_PATH/$OUTPUT_PREV_CHANNEL_FILE" ]; then diff --git a/multi-channel-bash-scripts/stop-all-channels.sh b/multi-channel-bash-scripts/stop-all-channels.sh index 6e7b569..a270f9f 100755 --- a/multi-channel-bash-scripts/stop-all-channels.sh +++ b/multi-channel-bash-scripts/stop-all-channels.sh @@ -37,7 +37,7 @@ if [ -e "$OUTPUT_PREV_CHANNEL_PATH/$OUTPUT_PREV_CHANNEL_FILE" ]; then fi # Scan the dir to see how many channels there are, store them in an arr. -CHANNEL_DIR_ARR=( $(find . -maxdepth 1 -type d -name '*'"$CHANNEL_DIR_INCREMENT_SYMBOL"'[[:digit:]]*' -printf "%P\n" | sort -t_ -n) ) +CHANNEL_DIR_ARR=( $(find . -maxdepth 1 -type d -name '*'"$CHANNEL_DIR_INCREMENT_SYMBOL"'[[:digit:]]*' -printf "%P\n" | sort -t"$CHANNEL_DIR_INCREMENT_SYMBOL" -n) ) # If this script see's there are multiple channels, # check each channel dir for running .pid file to kill the process/delete the file: diff --git a/multi-channel-bash-scripts/update-channels-from-git.sh b/multi-channel-bash-scripts/update-channels-from-git.sh old mode 100644 new mode 100755 index 049738a..1fa978b --- a/multi-channel-bash-scripts/update-channels-from-git.sh +++ b/multi-channel-bash-scripts/update-channels-from-git.sh @@ -24,7 +24,7 @@ CHANNEL_DIR_INCREMENT_SYMBOL="_" #----END EDITABLE VARS------- # Scan the dir to see how many channels there are, store them in an arr. -CHANNEL_DIR_ARR=( $(find . -maxdepth 1 -type d -name '*'"$CHANNEL_DIR_INCREMENT_SYMBOL"'[[:digit:]]*' -printf "%P\n" | sort -t_ -n) ) +CHANNEL_DIR_ARR=( $(find . -maxdepth 1 -type d -name '*'"$CHANNEL_DIR_INCREMENT_SYMBOL"'[[:digit:]]*' -printf "%P\n" | sort -t"$CHANNEL_DIR_INCREMENT_SYMBOL" -n) ) # If this script see's there are multiple channels, # then loop through each channel and run clone the repo there diff --git a/multi-channel-bash-scripts/updatechannels.sh b/multi-channel-bash-scripts/updatechannels.sh old mode 100644 new mode 100755 index 3ec7fb8..c2c2df5 --- a/multi-channel-bash-scripts/updatechannels.sh +++ b/multi-channel-bash-scripts/updatechannels.sh @@ -46,7 +46,7 @@ fi # If the file exists b # Scan the dir to see how many channels there are, store them in an arr. -CHANNEL_DIR_ARR=( $(find . -maxdepth 1 -type d -name '*'"$CHANNEL_DIR_INCREMENT_SYMBOL"'[[:digit:]]*' -printf "%P\n" | sort -t_ -n) ) +CHANNEL_DIR_ARR=( $(find . -maxdepth 1 -type d -name '*'"$CHANNEL_DIR_INCREMENT_SYMBOL"'[[:digit:]]*' -printf "%P\n" | sort -t"$CHANNEL_DIR_INCREMENT_SYMBOL" -n) ) # If this script see's there are multiple channels, # then loop through each channel and run the updates