setup, fix typo.

bashrc.sh

@@ -127,9 +127,14 @@ export PROJECT_TERMUX="$HOME/.git-env-termux"
 function test-termux {
 	if [[ -d "$PROJECT_TERMUX" ]]; then
   		log "`date` - Updating '$PROJECT_TERMUX'.\n"
+		echo " Switching to '$BRANCH'."
 		git -C "$PROJECT_TERMUX" switch "$BRANCH"
+		echo " Pulling with submodules."
 		git -C "$PROJECT_TERMUX" pull --recurse-submodules || \
 				( echo "Failed to pull project, exiting." && return 1 )
+		# Something above is doing a 'D setup.sh', so ensure it gets recreated.
+		echo " Ensuring setup.sh exists."
+		git -C "$PROJECT_TERMUX" restore setup.sh
 	else
   		log "`date` - Downloading '$PROJECT_TERMUX'.\n"
 		git clone https://git.hyperling.com/me/env-termux \
@@ -234,7 +239,7 @@ alias goodbye="update -y && bye"
 
 ## Video Related ##
 
-alias pull-content="mv -v $SS/DCIM/Camera/`date +"%Y-%m-%d"`* ./raw/"
+alias pull-content="mv -v $SS/DCIM/Camera/`date +"%Y-%m-%d"`* $SS/DCIM/OpenCamera/`date +"%Y%m%d"`* ./raw/"
 
 alias pull-screenshots="mv -v $SS/Pictures/Screenshots/*`date +"%Y%m%d"`* ./raw/"
 alias pull-screenshot="pull-screenshots"
@@ -354,6 +359,70 @@ alias pull-prod="pull_prod_backups"
 alias prod-pull="pull_prod_backups"
 
 
+## Root Workflows ##
+
+function go-root {
+	command="$1"
+	if [[ -z "$command" ]]; then
+		su
+	else
+		su -c "$command"
+	fi
+}
+alias root="go-root "
+alias doas-root="go-root "
+
+plex_dir='/data/user/0/com.plexapp.android/Plex Media Server/Sync/1'
+plex_movie_dir="$plex_dir"/1
+plex_series_dir="$plex_dir"/2
+function plex {
+	if [[ "$LOGNAME" == "root" ]]; then
+		cd "$plex_dir"
+	else
+		echo "Hopping into root, use this to go to plex's directory: "
+		echo "cd '$plex_dir'"
+		su
+	fi
+}
+function pull-plex {
+	dest="$1"
+	if [[ -z "$dest" ]]; then
+		dest=/sdcard/Movies/
+	fi
+
+	echo  "`date` - Copying files from '$plex_dir' to '$dest'."
+	su -c "cp -Rv '$plex_dir'/{1,2}/* '$dest'"
+
+	echo -e "\n`date` - Combining videos split into chunks."
+	cd "$dest"
+	ls | while read dir; do
+		echo -e "\n\n`date` - Checking '$dir'"
+		ls -lh "$dir"/*.mkv 2>/dev/null ||
+			ls -lh "$dir"/* 2>/dev/null ||
+			{
+				echo " Directory is empty, removing."
+				rmdir -v "$dir"
+				echo " Skipping to next directory."
+				continue
+			}
+		cd "$dir"
+		# Unsure why -e and -f don't work here. Spaces in filenames? Globs?
+		if [[ `ls *.chunk0 2>/dev/null` ]]; then
+			final="$dir.mkv"
+			echo -e "\n Catting files together to make '$final'."
+
+			cat *.chunk* > "$final"
+			ls -lh "$final"
+
+			mv -v *.chunk* ~/TRASH/
+		fi
+		echo "`date` - Done."
+		cd ..
+	done
+}
+alias get-plex="pull-plex"
+
+
 ## Finalize ##
 
 # Export all functions! #
@@ -370,6 +439,7 @@ eval "$(declare -F | grep -v _ | sed 's/-f /-fx /')"
 				title=TBD
 				message=TBD
 				success=0
+				cp "$PROJECT_TERMUX"/bashrc.sh ~/.bashrc
 				reload-termux || success=1
 				if [[ "$success" == 0 ]]; then
 					title="env-termux Updated"

setup.sh

@@ -33,19 +33,19 @@ if [[ ! -e ~/storage/shared ]]; then
 		echo "~/storage/shared/ now exists. :)"
 	else
 		echo "ERROR: Something ain't right, Jim! Abort!" >&2
-		exit 1
+		return 1
 	fi
 else
 	echo "Everything looks good already, pal."
 fi
 
 
-echo -e "\n`date` - Install & Updayte Crtical Software"
+echo -e "\n`date` - Install & Update Critical Software"
 pkg install -y \
-	openssh tsu vim htop git cronie man zip ncurses-utils \
+	openssh tsu vim htop git cronie man zip ncurses-utils which \
 	nmap traceroute wget rsync \
 	ffmpeg imagemagick \
-	kotlin php nodejs python libllvm hugo
+	kotlin php nodejs python libllvm hugo jq
 
 
 echo -e "\n`date` - BASH Environment"
@@ -134,4 +134,4 @@ echo "*******"
 
 PROG="$(basename -- "${BASH_SOURCE[0]}")"
 echo -e "\n`date` - Finished $PROG"
-exit 0
+return 0