diff --git a/script/install/install_OSX_dependency.sh b/script/install/install_OSX_dependency.sh index e6e2990..a49fac0 100755 --- a/script/install/install_OSX_dependency.sh +++ b/script/install/install_OSX_dependency.sh @@ -13,9 +13,13 @@ EL_USER=${USER} # Install PostgreSQL Server #-------------------------------------------------- echo "\n---- Install PostgreSQL Server ----" -brew install postgresql@15 -brew install postgis -brew services start postgresql@15 +if which psql >/dev/null 2>&1; then + echo "postgresql is already installed, skipping" +else + brew install postgresql@15 + brew install postgis + brew services start postgresql@15 +fi echo "\n---- Creating the ERPLibre PostgreSQL User ----" sudo su - postgres -c "createuser -s ${EL_USER}" 2> /dev/null || true @@ -25,6 +29,7 @@ sudo su - postgres -c "CREATE EXTENSION postgis;\nCREATE EXTENSION postgis_topol # Install Dependencies #-------------------------------------------------- echo "\n--- Installing Python 3 + pip3 --" +#TODO is python@3.7 line here still usefull?? Should we get rid of it? brew install git python@3.7 wget parallel mariadb brew link git brew link wget diff --git a/script/install/install_locally.sh b/script/install/install_locally.sh index 23d0631..7b68242 100755 --- a/script/install/install_locally.sh +++ b/script/install/install_locally.sh @@ -106,7 +106,10 @@ if [[ ! -f ${VENV_REPO_PATH} ]]; then fi # Make .venv active - +if [[ "${OSTYPE}" == "darwin"* ]]; then + echo -e "=======>source .venv/bin/activate here!!! <===============" + source .venv/bin/activate +fi echo -e "\n---- Installing poetry dependency ----" ${VENV_PATH}/bin/pip install --upgrade pip # Force python instead of changing env