Fix encoding for echo. Add a reload-shared if the project a;ready exists.
This commit is contained in:
10
setup.sh
10
setup.sh
@@ -16,7 +16,7 @@ if [[ "$1" == "skip" || "$2" == "skip" || "$3" == "skip" ]]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ "$skip" == "true" ]]; then
|
if [[ "$skip" == "true" ]]; then
|
||||||
echo "\n`date` - Skipping Updates"
|
echo -e "\n`date` - Skipping Updates"
|
||||||
else
|
else
|
||||||
echo -e "\n`date` - Upgrade Package Repos"
|
echo -e "\n`date` - Upgrade Package Repos"
|
||||||
pkg update &&
|
pkg update &&
|
||||||
@@ -41,7 +41,7 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
if [[ "$skip" == "true" ]]; then
|
if [[ "$skip" == "true" ]]; then
|
||||||
echo "\n`date` - Skipping Installs"
|
echo -e "\n`date` - Skipping Installs"
|
||||||
else
|
else
|
||||||
echo -e "\n`date` - Install Software"
|
echo -e "\n`date` - Install Software"
|
||||||
pkg install -y \
|
pkg install -y \
|
||||||
@@ -87,9 +87,10 @@ if [[ ! -d ~/Code && ! -d ~/sdcard/Code ]]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
echo -e "\n`date` - env-shared"
|
||||||
env_shared_dir="$HOME/.env-shared"
|
env_shared_dir="$HOME/.env-shared"
|
||||||
if [[ ! -d "$env_shared_dir" ]]; then
|
if [[ ! -d "$env_shared_dir" ]]; then
|
||||||
echo -e "\n`date` - env-shared"
|
echo -e "`date` - Not installed, downloading."
|
||||||
if [[ -z "$BRANCH" ]]; then
|
if [[ -z "$BRANCH" ]]; then
|
||||||
export BRANCH="dev"
|
export BRANCH="dev"
|
||||||
fi
|
fi
|
||||||
@@ -101,6 +102,9 @@ if [[ ! -d "$env_shared_dir" ]]; then
|
|||||||
mkdir -pv ~/bin
|
mkdir -pv ~/bin
|
||||||
fi
|
fi
|
||||||
cp -v ~/$env_shared_dir/bin-shared/* ~/bin/
|
cp -v ~/$env_shared_dir/bin-shared/* ~/bin/
|
||||||
|
else
|
||||||
|
echo -e "`date` - Already installed, updating."
|
||||||
|
update-shared
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user