diff --git a/README.md b/README.md index 882770b..212af49 100644 --- a/README.md +++ b/README.md @@ -24,17 +24,16 @@ ## To auto install on Linux: ```bash -[ "$(command -v apt-get)" -a -z "$(command -v wget)" ] && sudo apt-get install -y wget -[ "$(command -v pacman)" -a -z "$(command -v wget)" ] && sudo pacman -S wget -[ "$(command -v yum)" -a -z "$(command -v wget)" ] && sudo yum install -y wget -wget -qO - https://raw.githubusercontent.com/sn4k3/UVtools/master/Scripts/install-uvtools.sh | bash +[ "$(command -v apt-get)" -a -z "$(command -v curl)" ] && sudo apt-get install -y curl +[ "$(command -v pacman)" -a -z "$(command -v curl)" ] && sudo pacman -S curl +[ "$(command -v yum)" -a -z "$(command -v curl)" ] && sudo yum install -y curl +bash -c "$(curl -fsSL https://raw.githubusercontent.com/sn4k3/UVtools/master/Scripts/install-uvtools.sh)" ``` ## To auto install on MacOS (homebrew): ```bash -[ -z "$(command -v brew)" ] && /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" -brew install --cask uvtools +bash -c "$(curl -fsSL https://raw.githubusercontent.com/sn4k3/UVtools/master/Scripts/install-uvtools.sh)" ``` # MSLA/DLP, file analysis, calibration, repair, conversion and manipulation @@ -276,11 +275,11 @@ The following commands are the old way and commands under the UI executable, the **Copy the following script, paste and run on a terminal:** ```bash -[ "$(command -v apt-get)" -a -z "$(command -v wget)" ] && sudo apt-get install -y wget -[ "$(command -v pacman)" -a -z "$(command -v wget)" ] && sudo pacman -S wget -[ "$(command -v yum)" -a -z "$(command -v wget)" ] && sudo yum install -y wget -wget -qO - https://raw.githubusercontent.com/sn4k3/UVtools/master/Scripts/install-dependencies.sh | sudo bash -wget -qO - https://raw.githubusercontent.com/sn4k3/UVtools/master/Scripts/libdl-solver.sh | sudo bash +[ "$(command -v apt-get)" -a -z "$(command -v curl)" ] && sudo apt-get install -y curl +[ "$(command -v pacman)" -a -z "$(command -v curl)" ] && sudo pacman -S curl +[ "$(command -v yum)" -a -z "$(command -v curl)" ] && sudo yum install -y curl +sudo bash -c "$(curl -fsSL https://raw.githubusercontent.com/sn4k3/UVtools/master/Scripts/install-dependencies.sh)" +sudo bash -c "$(curl -fsSL https://raw.githubusercontent.com/sn4k3/UVtools/master/Scripts/libdl-solver.sh)" ``` **To run UVtools open it folder on a terminal and call one of:** diff --git a/Scripts/install-uvtools.sh b/Scripts/install-uvtools.sh index cd2a130..b834549 100644 --- a/Scripts/install-uvtools.sh +++ b/Scripts/install-uvtools.sh @@ -32,7 +32,15 @@ if [ "${OSTYPE:0:6}" == "darwin" ]; then exit -1 fi - [ -z "$(command -v brew)" ] && /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" + if [ -z "$(command -v brew)" ]; then + bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" + if [ -f "/opt/homebrew/bin/brew" ]; then + echo '# Set PATH, MANPATH, etc., for Homebrew.' >> /Users/$USER/.zprofile + echo 'eval "$(/opt/homebrew/bin/brew shellenv)"' >> /Users/$USER/.zprofile + eval "$(/opt/homebrew/bin/brew shellenv)" + fi + fi + brew install --cask uvtools exit 1 elif command -v apt-get &> /dev/null @@ -61,7 +69,7 @@ echo "- Detected: $osVariant $arch_name" if [ ! "$(ldconfig -p | grep libpng)" -o ! "$(ldconfig -p | grep libgdiplus)" -o ! "$(ldconfig -p | grep libavcodec)" ]; then echo "- Missing dependencies found, installing..." - wget -qO - $dependencies_url | sudo bash + sudo bash -c "$(curl -fsSL $dependencies_url)" fi echo "- Detecting download url"