maker/UVtools
1
0
Fork 0
mirror of https://github.com/riegera2412/UVtools.git synced 2026-07-08 17:42:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove wget dependency

Browse Source
This commit is contained in:
Tiago Conceição
2022-10-20 03:26:15 +01:00
parent 0ee5e925ea
commit 9feb17ed27
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Scripts/install-dependencies.sh
+3 -3
View File
@@ -34,19 +34,19 @@ then
apt-get update
apt-get install -y libdc1394-22 libopenexr24
apt-get install -y libdc1394-25 libopenexr25
apt-get install -y libjpeg-dev libpng-dev libgeotiff-dev libgeotiff5 libavcodec-dev libavformat-dev libswscale-dev libtbb-dev libgl1-mesa-dev libgdiplus wget
apt-get install -y libjpeg-dev libpng-dev libgeotiff-dev libgeotiff5 libavcodec-dev libavformat-dev libswscale-dev libtbb-dev libgl1-mesa-dev libgdiplus
elif command -v pacman &> /dev/null
then
osVariant="arch"
pacman -Syu
pacman -S openjpeg2 libjpeg-turbo libpng libgeotiff libdc1394 ffmpeg openexr tbb libgdiplus wget
pacman -S openjpeg2 libjpeg-turbo libpng libgeotiff libdc1394 ffmpeg openexr tbb libgdiplus
elif command -v yum &> /dev/null
then
osVariant="rhel"
yum update -y
yum install -y https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm
yum install -y https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm
yum install -y libjpeg-devel libjpeg-turbo-devel libpng-devel libgeotiff-devel libdc1394-devel ffmpeg-devel tbb-devel mesa-libGL libgdiplus wget
yum install -y libjpeg-devel libjpeg-turbo-devel libpng-devel libgeotiff-devel libdc1394-devel ffmpeg-devel tbb-devel mesa-libGL libgdiplus
else
echo "Error: Base operative system / package manager not identified, nothing was installed"
exit -1
Scripts/install-uvtools.sh
+2 -4
View File
@@ -83,17 +83,14 @@ fi
elif command -v apt-get &> /dev/null
then
osVariant="linux"
[ -z "$(command -v wget)" ] && sudo apt-get install -y wget
[ -z "$(command -v curl)" ] && sudo apt-get install -y curl
elif command -v pacman &> /dev/null
then
osVariant="arch"
[ -z "$(command -v wget)" ] && sudo pacman -S wget
[ -z "$(command -v curl)" ] && sudo pacman -S curl
elif command -v yum &> /dev/null
then
osVariant="rhel"
[ -z "$(command -v wget)" ] && sudo yum install -y wget
[ -z "$(command -v curl)" ] && sudo yum install -y curl
fi
@@ -125,7 +122,8 @@ filename="$(basename "${download_url}")"
tmpfile="/tmp/$filename"
echo "Downloading: $download_url"
wget $download_url -O "$tmpfile" -q --show-progress
#wget $download_url -O "$tmpfile" -q --show-progress
curl -L --retry 3 $download_url -o "$tmpfile"
echo "- Setting permissions"
chmod -fv a+x "$tmpfile"