Add quotes to variable in conditional.

bin-shared/pull-clone.sh

@@ -1,47 +0,0 @@
-#!/usr/bin/env bash
-
-# TBD:
-# - merge into send-master script and use a variable to control push vs pull.
-
-## Variables ##
-
-PROG="$(basename -- "${BASH_SOURCE[0]}")"
-loop=false
-
-DIR="`pwd`"
-dir="`basename $DIR`"
-
-## Validations ##
-
-if [[ "$DIR" != *"-clone" ]]; then
-   echo "'$DIR' is not labeled as a clone. Skipping download."
-   exit 0
-fi
-
-## Main ##
-
-echo "`date` - Pulling" \
-   "'$PROD_DATA_USER@$PROD_DATA_HOST:$PROD_DATA_PORT$PROD_DATA_DIR/$dir'" \
-   "to '$dir'."
-
-sleep=0
-while true; do
-   if (( $sleep > 0 )); then
-      echo "Sleeping for '$sleep' seconds..."
-      sleep $sleep
-   fi
-   clone -e "ssh -p $PROD_DATA_PORT" \
-         $PROD_DATA_USER@$PROD_DATA_HOST:$PROD_DATA_DIR/$new_dir \
-         . &&
-      echo "`date` - Success!" ||
-      echo "`date` - Failed!"
-   sleep=30
-   if [[ "$loop" == false ]]; then
-      break;
-   fi
-done
-
-## Complete ##
-
-echo "`date` - $PROG complete."
-exit 0

bin-shared/pull_clone.sh

@@ -0,0 +1,66 @@
+#!/usr/bin/env bash
+
+# TBD:
+# - merge into send-master script and use a variable to control push vs pull.
+
+## Variables ##
+
+PROG="$(basename -- "${BASH_SOURCE[0]}")"
+loop=false
+
+DIR="`pwd`"
+dir="`basename $DIR`"
+
+## Validations ##
+
+if [[ "$DIR" != *"-clone" && "$DIR" != *"-SYNC" ]]; then
+   echo "'$DIR' is not labeled as a CLONE or SYNC. Skipping download."
+   exit 0
+fi
+
+# Only pull the existing subdirectories rather than ALL content.
+subdirs_only="false"
+if [[ "$dir" == "music-clone" ]]; then
+   subdirs_only="true"
+fi
+
+## Main ##
+
+echo "`date` - Pulling" \
+   "'$PROD_DATA_USER@$PROD_DATA_HOST:$PROD_DATA_PORT$PROD_DATA_DIR/$dir'" \
+   "to '$dir'."
+
+sleep=0
+while true; do
+   if (( $sleep > 0 )); then
+      echo "Sleeping for '$sleep' seconds..."
+      sleep $sleep
+   fi
+
+   if [[ "$subdirs_only" == "true" ]]; then
+      ls $DIR | while read subdir; do
+         echo -e "\n`date` - Working subdirectory '$subdir'..."
+         clone -e "ssh -p $PROD_DATA_PORT" \
+               $PROD_DATA_USER@$PROD_DATA_HOST:$PROD_DATA_DIR/$dir/$subdir/ \
+               ./$subdir &&
+            echo "`date` - Success!" ||
+            echo "`date` - Failed!"
+      done
+   else
+      clone -e "ssh -p $PROD_DATA_PORT" \
+            $PROD_DATA_USER@$PROD_DATA_HOST:$PROD_DATA_DIR/$dir/ \
+            . &&
+         echo "`date` - Success!" ||
+         echo "`date` - Failed!"
+   fi
+
+   sleep=30
+   if [[ "$loop" == false ]]; then
+      break;
+   fi
+done
+
+## Complete ##
+
+echo -e "\n`date` - $PROG complete."
+exit 0

bin-shared/send_master.sh

@@ -14,8 +14,8 @@ dir="`basename $DIR`"
 
 ## Validations ##
 
-if [[ "$DIR" != *"MASTER" ]]; then
-   echo "'$DIR' is not labeled as a MASTER. Skipping upload."
+if [[ "$DIR" != *"-MASTER" && "$DIR" != *"-SYNC" ]]; then
+   echo "'$DIR' is not labeled as a MASTER or SYNC. Skipping upload."
    exit 0
 fi
 

rc_shared.sh

@@ -37,6 +37,20 @@ alias l='ls '
 alias ll='ls -alh '
 alias lh='ls -ash '
 
+function cl {
+	if [[ -d /sdcard ]]; then
+		cd /sdcard/Library/Clones
+	else
+		cd $HOME/Clones
+	fi
+}
+alias clones="cl"
+alias cdl="cl"
+alias cdc="cl"
+
+alias library="clones && cd .."
+alias lib="library"
+
 # Networking #
 
 alias scan="nmap -A -p- --script=vuln "
@@ -46,13 +60,21 @@ alias scan="nmap -A -p- --script=vuln "
 
 # Related specifically to this project. #
 
-function update-shared {
-   log "`date` - Reloading the '~/.rc_shared' file from env-shared.\n"
-   branch="$1"
+branch="$BRANCH"
+if [[ -z "$branch" ]]; then
+	branch="$PROD_GIT_BRANCH"
+fi
 if [[ -z "$branch" ]]; then
 	branch="dev"
 fi
 
+function update-shared-old {
+   log "`date` - Reloading the '~/.rc_shared' file from env-shared.\n"
+
+	if [[ -n "$1" ]]; then
+		branch="$1"
+	fi
+
    dir="shared-rc-deleteme"
 
    git clone https://git.hyperling.com/me/env-shared \
@@ -60,17 +82,136 @@ function update-shared {
 
    mv -v $dir/rc_shared.sh ~/.rc_shared
 
+	local_bin="$HOME/bin"
+	remote_bin="shared-rc-deleteme/bin-shared"
+	if [[ -d "$local_bin" ]]; then
+		log "\n`date` - Found '$local_bin', adding scripts.\n"
+		mv -v $remote_bin/*.sh "$local_bin"/
+
+		refactor_script="refactor_music_library.sh"
+		wget -O "$refactor_script" \
+			https://git.hyperling.com/me/shell-music-refactor-library/raw/branch/main/refactor_music_library.sh
+		mv -v $refactor_script "$local_bin"/
+
+		chmod 755 -Rc "$local_bin"
+	else
+		echo "Did not find '$local_bin', did not copy scripts."
+	fi
+
+	log "\n`date` - Done! Removing git clone.\n"
    mv -v $dir ~/TRASH/"$dir-`date "+%Y%m%d-%H%M%S"`"
 
-   log "\n`date` - Complete! Please note this does NOT update bin files."
+   log "\n`date` - Complete!"
 }
+
+PROJECT_SHARED="$HOME/.git-env-shared"
+function update-shared2 {
+	# Refresh the local env-shared repo.
+	if [[ -d $PROJECT_SHARED ]]; then
+  		log "`date` - Updating '$PROJECT_SHARED'.\n"
+		git -C "$PROJECT_SHARED" switch "$branch"
+		git -C "$PROJECT_SHARED" pull --recurse-submodules || \
+				( echo "Failed to pull project, exiting." && return 1 )
+	else
+  		log "`date` - Downloading '$PROJECT_SHARED'.\n"
+		git clone https://git.hyperling.com/me/env-shared \
+				"$PROJECT_SHARED" --branch=$branch
+	fi
+
+	# Tha main piece! Reload the shared RC file.
+   cp -v "$PROJECT_SHARED"/rc_shared.sh ~/.rc_shared
+	cp -v "$PROJECT_SHARED"/vimrc.vim ~/.vimrc
+
+	# Copy the scripts from the shared bin to the home bin.
+	local_bin="$HOME/bin"
+	remote_bin="$PROJECT_SHARED/bin-shared"
+	if [[ -d "$local_bin" ]]; then
+		log "\n`date` - Found '$local_bin', adding scripts.\n"
+		cp -v "$remote_bin"/*.sh "$local_bin"/
+
+		refactor_script="refactor_music_library.sh"
+		wget -O "$refactor_script" \
+			https://git.hyperling.com/me/shell-music-refactor-library/raw/branch/main/refactor_music_library.sh
+		mv -v $refactor_script "$local_bin"/
+
+		chmod 755 -Rc "$local_bin"
+	else
+		echo "Did not find '$local_bin', did not copy scripts."
+	fi
+
+   log "\n`date` - Complete!"
+}
+alias shared-update2="update-shared2"
+alias reload-shared2="update-shared2"
+alias shared-reload2="update-shared2"
+
+alias update-shared="update-shared2"
 alias shared-update="update-shared"
 alias reload-shared="update-shared"
 alias shared-reload="update-shared"
 
+function reload-all {
+	log "`date` - Reloading BASH"
+	reload-bash
+
+	log "\n`date` - Reloading Main (Termux/Ansible)"
+	if [[ -d /sdcard ]]; then
+		reload-termux
+	else
+		scm.sh
+	fi
+	reload-bash
+
+	log "\n`date` - Reloading Shared"
+	reload-shared
+	reload-bash
+}
+alias all-reload="reload-all"
+
+function update-all {
+	log "`date` - Updating env projects..."
+	reload-all
+
+	log "\n\n\n`date` - Running system updates..."
+	update -y
+
+	if [[ $(type -t update-sdk 2>/dev/null 1>&2) ]]; then
+		log "\n\n\n`date` - Updating SDKs..."
+		update-sdk
+	fi
+
+	log "\n\n\n`date` - Done with update-all!"
+}
+alias all-update="update-all"
+
+PROJECT_SHARED_OLD01="$HOME/.env-shared"
+if [[ -d "$PROJECT_SHARED_OLD01" ]]; then
+	log "`date` - Removing old project name '$PROJECT_SHARED_OLD01'."
+	mv -v "$PROJECT_SHARED_OLD01" "$TRASH"/env-shared-deleteme | grep -v ".git"
+fi
+
 # Shortcuts #
 
 function send-master { send_master.sh; }
+alias push-master="send-master"
+alias sync-master="send-master"
+
+function pull-clone { pull_clone.sh; }
+alias get-clone="pull-clone"
+alias sync-clone="pull-clone"
+
+alias send-sync="send-master"
+alias push-sync="send-master"
+alias pull-sync="pull-clone"
+alias get-sync="pull-clone"
+function sync-sync {
+	cat <<- EOF
+		Command not implemented, too dangerous guessing the state of the folder.
+
+		Please use push-sync and pull-sync in the correct order for its current state.
+	EOF
+}
+
 function goodbye { update -y; bye; }
 
 function clone {
@@ -80,18 +221,117 @@ function clone {
 function now { date "+%Y%m%d-%H%M%S"; }
 function today { date "+%Y%m%d"; }
 
+function log {	echo -e "$1"; }
+function blog { echo -e "\n\n$1\n\n"; }
+
+function pull {
+	if [[ -d .git ]]; then
+		git pull --recurse-submodules
+	else
+		pull-clone
+	fi
+}
+
+function push {
+	if [[ -d .git ]]; then
+		git push && load-stage && load-prod
+	else
+		send-master
+	fi
+}
+
 # Enhance Bin Scripts #
 
+# MASTER and CLONE folders.
+
 function send-masters {
-   echo -e "`date` - Looping through MASTER directories.\n"
-   ls | grep MASTER | while read dir; do
-      echo -e "`date` - Found '$dir'..."
+   echo -e "`date` - Looping through MASTER directories."
+   ls | grep "\-MASTER" | while read dir; do
+      echo -e "\n`date` - Found '$dir'..."
       cd $dir
       send-master
       cd ..
    done
    echo -e "\n`date` - Done checking for MASTER directories."
 }
+alias push-masters="send-masters"
+alias sync-masters="send-masters"
+
+function pull-clones {
+   echo -e "`date` - Looping through clone directories."
+   ls | grep "\-clone" | while read dir; do
+      echo -e "\n`date` - Found '$dir'..."
+      cd $dir
+      pull-clone
+      cd ..
+   done
+   echo -e "\n`date` - Done checking for clone directories."
+}
+alias get-clones="pull-clones"
+alias sync-clones="pull-clones"
+
+function sync-all {
+	push-masters
+	echo -e "\n"
+	pull-clones
+
+	echo -e "\n`date` - Skipping SYNC folders! Please do their loads separately."
+   ls | grep "\-SYNC" | while read dir; do
+		echo "- $dir"
+	done
+
+	echo -e "`date` - Done.\n"
+}
+function sync-all-loop {
+	typeset -i sleep_time
+	if [[ "$1" ]]; then
+		sleep_time="$1"
+	fi
+	if [[ -z "$sleep_time" || "$sleep_time" == 0 ]]; then
+		sleep_time="300"
+	fi
+	log "`date` - Sleep timer set for '$sleep_time' seconds."
+	while true; do
+		sync-all
+		echo -e "\n\n*** Sleeping... ***\n\n"
+		sleep 300
+	done
+}
+
+# SYNC folders.
+
+function send-syncs {
+   echo -e "`date` - Looping through SYNC directories."
+   ls | grep "\-SYNC" | while read dir; do
+      echo -e "\n`date` - Found '$dir'..."
+      cd $dir
+      send-master
+      cd ..
+   done
+   echo -e "\n`date` - Done checking for SYNC directories."
+}
+alias push-syncs="send-syncs"
+
+function pull-syncs {
+   echo -e "`date` - Looping through SYNC directories."
+   ls | grep "\-SYNC" | while read dir; do
+      echo -e "\n`date` - Found '$dir'..."
+      cd $dir
+      pull-clone
+      cd ..
+   done
+   echo -e "\n`date` - Done checking for SYNC directories."
+}
+alias get-syncs="pull-syncs"
+
+function sync-syncs {
+	cat <<- EOF
+		Command not implemented, too dangerous guessing the state of the folder.
+
+		Please use push-syncs and pull-syncs in the correct order for its current state.
+	EOF
+}
+
 
 # Audio #
 
@@ -200,9 +440,11 @@ function process-video {
 		mv -v ffmpeg2pass*.log* ~/TRASH/
 	fi
 
+	echo "`date` - Syncing data."
 	sync
 	sleep 10
 	sync
+
 	if [[ -s $newfile ]]; then
 		echo "`date` - Getting file sizes."
 		du -h "$file"
@@ -215,7 +457,7 @@ function process-video {
 	return $status
 }
 alias pv="process-video"
-alias qpv="pv ./raw/YouCut*.mp4 `basename $(pwd)`.mp4"
+alias qpv="pv ./raw/YouCut*.mp4 $(basename `pwd`).mp4"
 
 # Allow converting video to audio and other smaller
 # tasks than what process-video is intended to do.
@@ -316,9 +558,67 @@ alias vta="v2a"
 alias pull-audio="v2a"
 alias pa="v2a"
 
+
+## Trash Related ##
+
+TRASH_ROOT="/"
+if [[ -d "/sdcard" ]]; then
+	# Android / Termux
+	TRASH_ROOT="/sdcard"
+else
+	# Desktop
+	TRASH_ROOT="$HOME"
+fi
+TRASH="$TRASH_ROOT/TRASH"
+
+alias trash="cd $TRASH"
+
+alias clean-trash="bash -c 'rm -rfv "$TRASH"/*'; clean-trashed"
+alias trash-clean="clean-trash"
+
+alias check-trash='du -h $TRASH | sort -h; find "$TRASH_ROOT" -name .Trash"*" -exec du -h {} \; -exec mv -v {} "$TRASH"/ \;'
+alias trash-check="check-trash"
+
+alias check-trashed='find "$TRASH_ROOT" -name ".trashed*" -exec du -h {} \; -exec mv -v {} "$TRASH"/ \; | sort -h'
+alias clean-trashed='find "$TRASH_ROOT" -name ".trashed*" -exec du -h {} \; -delete | sort -h'
+
+
+## Finalize ##
+
 # Export all functions! #
 eval "$(declare -F | grep -v _ | sed 's/-f /-fx /')"
 
+# Run update checker in background.
+(
+	(
+		if [[ -d "$PROJECT_SHARED" ]]; then
+			git -C "$PROJECT_SHARED" fetch >/dev/null 2>&1 \
+				&& git -C "$PROJECT_SHARED" status \
+				| grep "is behind" \
+			| while read status; do
+				title=TBD
+				message=TBD
+				success=0
+				reload-shared || success=1
+				if [[ "$success" == 0 ]]; then
+					title="env-shared Updated"
+					message="Reloaded automatically, please reload BASH. :)"
+				else
+					title="env-shared Updates Available"
+					message="Update with 'reload-shared'."
+				fi
+				if [[ -d /sdcard ]]; then
+					termux-notification \
+						-t "$title" \
+						-c "$message"
+				else
+					notify-send "$title" "$message"
+				fi
+			done
+		fi
+	) >> "$HOME"/Reports/env-shared.log.txt 2>&1 &
+)
+
 
 ## Complete! ##