Move common to profile/_assets

envrcd

@@ -27,4 +27,5 @@ function source_dir_if_exists {
     source_if_exists "${1}/.bashrc"
 }
 
+# source envrcd files
 source_if_exists "${ENVRCD_PATH}/${ENVRCD_NAME}.d/*"

envrcd.d/30-validate

 #!/bin/bash
 
+# allowed characters for ENVRCD_SET_PROFILE and ENVRCD_SET_USER
+VALID='0-9a-zA-Z_-'
+# ENVRCD_SET_PROFILE must start with an alphanumeric character
+PROFILE_FORMAT='^[0-9a-zA-Z]'
+
 # validate settings variable for security reasons
 if [ ! -z "${ENVRCD_SET_PROFILE}" ]; then
-    valid='0-9a-zA-Z_-'
-    if [[ ! ${ENVRCD_SET_PROFILE} =~ [^${valid}] ]]; then
+    if [[ ! ${ENVRCD_SET_PROFILE} =~ [^${VALID}] ]] && [[ ${ENVRCD_SET_PROFILE} =~ ${PROFILE_FORMAT} ]]; then
         debug "ENVRCD_SET_PROFILE contains valid characters: ${ENVRCD_SET_PROFILE}"
         export ENVRCD_PROFILE="${ENVRCD_SET_PROFILE}"
     else
@@ -16,7 +20,7 @@ fi
 # validate settings variable for security reasons
 if [ ! -z "${ENVRCD_SET_USER}" ]; then
     valid='0-9a-zA-Z_-'
-    if [[ ! ${ENVRCD_SET_USER} =~ [^${valid}] ]]; then
+    if [[ ! ${ENVRCD_SET_USER} =~ [^${VALID}] ]]; then
         debug "ENVRCD_SET_USER contains valid characters: ${ENVRCD_SET_USER}"
         export ENVRCD_USER="${ENVRCD_SET_USER}"
     else
@@ -25,3 +29,6 @@ if [ ! -z "${ENVRCD_SET_USER}" ]; then
         unset ENVRCD_USER
     fi
 fi
+
+unset VALID
+unset PROFILE_FORMAT

profile/ataraxia/envrcd.d/30-prompt

 #!/bin/bash
 
-source_if_exists "${ENVRCD_PATH}/common/functions/truncate_pwd"
-source_if_exists "${ENVRCD_PATH}/common/functions/git_status"
+source_if_exists "${ENVRCD_PATH}/profile/_assets/functions/truncate_pwd"
+source_if_exists "${ENVRCD_PATH}/profile/_assets/functions/git_status"
 
 function envrcd_prompt_ataraxia {
     # Truncate the directory path if it exceeds a certain length. arguments: spacefree pwdminlen

profile/default/envrcd.d/30-prompt

 #!/bin/bash
 
-source_if_exists "${ENVRCD_PATH}/common/functions/truncate_pwd"
-source_if_exists "${ENVRCD_PATH}/common/functions/git_status"
+source_if_exists "${ENVRCD_PATH}/profile/_assets/functions/truncate_pwd"
+source_if_exists "${ENVRCD_PATH}/profile/_assets/functions/git_status"
 
 function envrcd_prompt_default {
     # truncate the directory path if it exceeds a certain length. arguments: spacefree pwdminlen

profile/rda/.vim/colors/jellybeans.vim

-../../../../common/vim/colors/jellybeans.vim
\ No newline at end of file
+../../../_assets/vim/colors/jellybeans.vim
\ No newline at end of file

profile/rda/envrcd.d/30-prompt

 #!/bin/bash
 
-source_if_exists "${ENVRCD_PATH}/common/functions/exit_status"
-source_if_exists "${ENVRCD_PATH}/common/functions/truncate_pwd"
-source_if_exists "${ENVRCD_PATH}/common/functions/git_status"
+source_if_exists "${ENVRCD_PATH}/profile/_assets/functions/exit_status"
+source_if_exists "${ENVRCD_PATH}/profile/_assets/functions/truncate_pwd"
+source_if_exists "${ENVRCD_PATH}/profile/_assets/functions/git_status"
 
 function envrcd_prompt_rda {
     # show exit status of last command (needs to be the first function called). arguments: good, bad