Browse Source

text bugfixes

main
Zen 3 years ago
parent
commit
b29f1d6b26
  1. 17
      ingredients/copper
  2. 6
      recipes/ao.sh

17
ingredients/copper

@ -13,17 +13,14 @@
locate_torrc() { locate_torrc() {
if [ -n $TORRCPATH ]; then 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' TORRCPATH='/usr/local/etc/tor/torrc'
elif [ -e /etc/tor/torrc ]; then elif [ -f /etc/tor/torrc ]; then
TORRCPATH='/etc/tor/torrc' 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 else
echo -e "${RED}Uh oh...${RESET} I couldn't figure out\ echo -e "${RED}Uh oh...${RESET} I couldn't figure out where your torrc file is. That might cause some issues"
where your torrc file is. That might cause some issues"
sleep 3 sleep 3
echo "Anyways..." echo "Anyways..."
sleep 2 sleep 2
@ -180,7 +177,7 @@ get_domain() {
;; ;;
esac esac
done done
echo "${BLUE}${DOMAIN}${RESET}, got it." echo -e "${BLUE}${DOMAIN}${RESET}, got it."
remember "DOMAIN=${DOMAIN}" remember "DOMAIN=${DOMAIN}"
;; ;;
*) *)
@ -194,7 +191,7 @@ configure_domain_for_site() {
get_domain get_domain
if [ -f /etc/nginx/sites-enabled/${1} ]; then if [ -f /etc/nginx/sites-enabled/${1} ]; then
if [ ! -z $DOMAIN ]; 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 else
echo "You didn't provide a domain to configure!" echo "You didn't provide a domain to configure!"
fi fi

6
recipes/ao.sh

@ -97,7 +97,7 @@ while [[ -z $AO ]]; do
case $ao_select in case $ao_select in
"1") "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 AO=3
;; ;;
"2") "2")
@ -215,8 +215,8 @@ case $AO in
echo "" echo ""
pushd ~/ao-react pushd ~/ao-react
#npm install npm install
#npm run webpack npm run webpack
popd popd
NODE_PARAMS='--experimental-specifier-resolution=node -r dotenv/config' NODE_PARAMS='--experimental-specifier-resolution=node -r dotenv/config'

Loading…
Cancel
Save