From e285ef2e2951afb29cf8d8b73b7e6861f6629713 Mon Sep 17 00:00:00 2001 From: Jason Pitman Date: Thu, 22 Aug 2019 17:16:21 -0500 Subject: [PATCH] ertyasd --- backup/archive_repos/_lib/c/base.sh | 16 ++++++---- backup/archive_repos/_lib/config.sh | 22 +++++++------- backup/archive_repos/_lib/functions.sh | 41 +++++++++++++++++++------- 3 files changed, 52 insertions(+), 27 deletions(-) diff --git a/backup/archive_repos/_lib/c/base.sh b/backup/archive_repos/_lib/c/base.sh index f033908..33e9676 100644 --- a/backup/archive_repos/_lib/c/base.sh +++ b/backup/archive_repos/_lib/c/base.sh @@ -5,6 +5,8 @@ if [ $path = 'c' ]; then source ./esc.sh fi +source ./_lib/functions.sh + # FF colors # ------------------------------------------------------------------------------ # ff4500 - #ff4500 @@ -62,20 +64,24 @@ bg_lightpurple_w_blk="${esc_seq_fg}${c_black}${esc_seq_bg}${base_lightpurple}" function print_ff() { clear echo - echo -e "${fg_darkgrey_01}------------------------------------------------------------${reset}" + echo -e "${fg_darkgrey_01} ------------------------------------------------------- ${reset}" echo - echo -e "${indent}${indent}${bg_darkpurple} Base colors: ${reset}" + indent; indent; echo -e "${bg_darkpurple} Base colors: ${reset}" echo for var in "${!fg_@}"; do #printf '%s=%s\n' "$var" "${!var}" - printf "${var} ${fg_lightgrey}(%s)${reset}: ${esc_seq_fg}${!var}${var}${reset}\n" "${!var:10}" + indent; + indent; + printf "${ind}${ind}${var} ${fg_lightgrey}(%s)${reset}: ${esc_seq_fg}${!var}${var}${reset}\n" "${!var:10}" done echo for var in "${!bg_@}"; do - printf "${var}: ${!var} ${var} ${reset}\n" + indent; + indent; + printf "${indent}${indent}${var}: ${!var} ${var} ${reset}\n" done echo - echo -e "${fg_darkgrey_01}------------------------------------------------------------${reset}" + echo -e "${fg_darkgrey_01} -------------------------------------------------------- ${reset}" echo } if [ $path = 'c' ]; then diff --git a/backup/archive_repos/_lib/config.sh b/backup/archive_repos/_lib/config.sh index cd5ed9a..044bdb9 100755 --- a/backup/archive_repos/_lib/config.sh +++ b/backup/archive_repos/_lib/config.sh @@ -7,18 +7,18 @@ # # ------------------------------------------------------------------------------ -# User specified directories +# User specified directories (no trailing slashes!) # ------------------------------------------------------------------------------ -# base_dir="/Volumes/xxx/xxx/xxx" -# source_repo_dir="repos" -# output_dir="archive" -# repo_list="${base_dir}/_src/repo_list.txt" -# -# # Variables for functions - Don't mess with these -# # ------------------------------------------------------------------------------ -# filelines="$(cat $repo_list)" -# source="${base_dir}/${source_repo_dir}" -# output="${base_dir}/${output_dir}" +base_dir="~/Desktop/test" +source_repo_dir="repos" +output_dir="archive" +repo_list="${base_dir}/_src/repo_list.txt" + +# Variables for functions - Don't mess with these +# ------------------------------------------------------------------------------ +filelines="$(cat $repo_list)" +source="${base_dir}/${source_repo_dir}" +output="${base_dir}/${output_dir}" # Debugging # ------------------------------------------------------------------------------ diff --git a/backup/archive_repos/_lib/functions.sh b/backup/archive_repos/_lib/functions.sh index 9a7cfa5..fd11c2d 100755 --- a/backup/archive_repos/_lib/functions.sh +++ b/backup/archive_repos/_lib/functions.sh @@ -1,10 +1,14 @@ #!/usr/bin/env bash +# Indention - for reuse +# ----------------------------------------------- +ind=" " indent() { - local ind=" " printf "${ind}" } +# Seperators +# ----------------------------------------------- sep() { local ch="-" local sep_line="$(printf '%*s' "60" | tr ' ' "$ch")" @@ -12,19 +16,34 @@ sep() { #echo -e "-----------------------------------------------------------------------------" } - # Check directory existence # ----------------------------------------------- -# if [ ! -d "${source}" ]; then -# mkdir ${source} -# fi -# -# if [ ! -d "${output}" ]; then -# mkdir ${output} -# fi -# -# +if [ ! -d "${base_dir}" ]; then + echo -e "Base dir doesn't exist. Making it now." + echo -e "mkdir ${base_dir}" + #mkdir ${source} +else + echo -e "Base dir exists at ${base_dir}" +fi + +if [ ! -d "${source}" ]; then + echo -e "Source dir doesn't exist. Making it now." + echo -e "mkdir ${source}" + #mkdir ${source} +else + echo -e "Source dir exists at ${source}" +fi + +if [ ! -d "${output}" ]; then + echo -e "Output dir doesn't exist. Making it now." + echo -e "mkdir ${output}" + #mkdir ${output} +else + echo -e "Output dir exists at ${output}" +fi + + # # Clone everything in repo_list to source folder # # ----------------------------------------------- #