From b29f1d6b262c6a5c10b9ebe201cb16d814e3fb6f Mon Sep 17 00:00:00 2001 From: Zen Date: Tue, 1 Mar 2022 22:24:23 -0600 Subject: [PATCH] text bugfixes --- ingredients/copper | 17 +++++++---------- recipes/ao.sh | 6 +++--- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/ingredients/copper b/ingredients/copper index a3f4019..d4a517d 100644 --- a/ingredients/copper +++ b/ingredients/copper @@ -13,17 +13,14 @@ locate_torrc() { if [ -n $TORRCPATH ]; then - if [ -e /usr/local/etc/tor/torrc ]; then + if [ -f $HOME/.tor/torrc ]; then + TORRCPATH="${HOME}/.tor/torrc" + elif [ -f /usr/local/etc/tor/torrc ]; then TORRCPATH='/usr/local/etc/tor/torrc' - elif [ -e /etc/tor/torrc ]; then + elif [ -f /etc/tor/torrc ]; then TORRCPATH='/etc/tor/torrc' - elif [ -e $HOME/.tor/torrc ]; then - TORRCPATH="${HOME}/.tor/torrc" - elif [ -e $HOME/.tor/torrc ]; then - TORRCPATH="${HOME}/.tor/torrc" else - echo -e "${RED}Uh oh...${RESET} I couldn't figure out\ - where your torrc file is. That might cause some issues" + echo -e "${RED}Uh oh...${RESET} I couldn't figure out where your torrc file is. That might cause some issues" sleep 3 echo "Anyways..." sleep 2 @@ -180,7 +177,7 @@ get_domain() { ;; esac done - echo "${BLUE}${DOMAIN}${RESET}, got it." + echo -e "${BLUE}${DOMAIN}${RESET}, got it." remember "DOMAIN=${DOMAIN}" ;; *) @@ -194,7 +191,7 @@ configure_domain_for_site() { get_domain if [ -f /etc/nginx/sites-enabled/${1} ]; then if [ ! -z $DOMAIN ]; then - sed -i "s#server_name.*#server_name $DOMAIN;#" /etc/nginx/sites-enabled/${1} + sudo sed -i "s#server_name.*#server_name $DOMAIN;#" /etc/nginx/sites-enabled/${1} else echo "You didn't provide a domain to configure!" fi diff --git a/recipes/ao.sh b/recipes/ao.sh index 8e3fc92..bf52ab4 100755 --- a/recipes/ao.sh +++ b/recipes/ao.sh @@ -97,7 +97,7 @@ while [[ -z $AO ]]; do case $ao_select in "1") - echo "Minimalism, I like it! Proceeding with ${BLUE}ao-3${RESET} installation" + echo -e "Minimalism, I like it! Proceeding with ${BLUE}ao-3${RESET} installation" AO=3 ;; "2") @@ -215,8 +215,8 @@ case $AO in echo "" pushd ~/ao-react - #npm install - #npm run webpack + npm install + npm run webpack popd NODE_PARAMS='--experimental-specifier-resolution=node -r dotenv/config'