updated install scripts

default-writer · Jun 17, 2024 · 5af3269 · 5af3269
1 parent 04b9050
commit 5af3269
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/bin/utils/install.sh b/bin/utils/install.sh
@@ -65,7 +65,7 @@ while (($#)); do
         "--clangd") # installs clangd 17.0.3
             [[ ! -d "${pwd}/.tools" ]] && mkdir "${pwd}/.tools"
             [[ ! -d "${pwd}/.tools/clangd_17.0.3" ]] && mkdir "${pwd}/.tools/clangd_17.0.3"
-            wget https://github.com/clangd/clangd/releases/download/17.0.3/clangd-linux-17.0.3.zip -qO "/tmp/clangd-linux-17.0.3.zip"
+            curl -L https://github.com/clangd/clangd/releases/download/17.0.3/clangd-linux-17.0.3.zip -o "/tmp/clangd-linux-17.0.3.zip"
             unzip -o -q "/tmp/clangd-linux-17.0.3.zip" -d "/tmp"
             cp -r "/tmp/clangd_17.0.3/." "${pwd}/.tools/clangd_17.0.3"
             rm -rf "/tmp/clangd-linux-17.0.3"
@@ -75,7 +75,7 @@ while (($#)); do
         "--cmake") # installs cmake
             [[ ! -d "${pwd}/.tools" ]] && mkdir "${pwd}/.tools"
             [[ ! -d "${pwd}/.tools/cmake-3.25" ]] && mkdir "${pwd}/.tools/cmake-3.25"
-            wget https://github.com/Kitware/CMake/releases/download/v3.25.3/cmake-3.25.3-linux-x86_64.sh -qO "/tmp/cmake-3.25.3-linux-x86_64.sh"
+            curl -L https://github.com/Kitware/CMake/releases/download/v3.25.3/cmake-3.25.3-linux-x86_64.sh -o "/tmp/cmake-3.25.3-linux-x86_64.sh"
             chmod +x "/tmp/cmake-3.25.3-linux-x86_64.sh"
             DEBIAN_FRONTEND=noninteractive /tmp/cmake-3.25.3-linux-x86_64.sh --prefix=${pwd}/.tools/cmake-3.25 --skip-license
             rm "/tmp/cmake-3.25.3-linux-x86_64.sh"

diff --git a/bin/utils/setup.sh b/bin/utils/setup.sh
@@ -99,7 +99,7 @@ while (($#)); do
             ;;
 
         "--clangd") # installs clangd 17.0.3 system wide
-            wget "https://apt.llvm.org/llvm.sh" -qO "/tmp/llvm.sh"
+            curl -L "https://apt.llvm.org/llvm.sh" -o "/tmp/llvm.sh"
             chmod u+x /tmp/llvm.sh
             /tmp/llvm.sh 17
             rm -r /tmp/llvm.sh
@@ -137,7 +137,7 @@ while (($#)); do
 
         "--powershell") # installs powershell
             update ${updateflags}
-            apt install -y wget apt-transport-https software-properties-common
+            apt install -y wget curl apt-transport-https software-properties-common
             curl -sL "https://packages.microsoft.com/config/ubuntu/$(lsb_release -rs)/packages-microsoft-prod.deb" -o /tmp/packages-microsoft-prod.deb
             dpkg -i /tmp/packages-microsoft-prod.deb
             apt update -y

diff --git a/workspace/bin/utils/install.sh b/workspace/bin/utils/install.sh
@@ -65,7 +65,7 @@ while (($#)); do
         "--clangd") # installs clangd 17.0.3
             [[ ! -d "${pwd}/.tools" ]] && mkdir "${pwd}/.tools"
             [[ ! -d "${pwd}/.tools/clangd_17.0.3" ]] && mkdir "${pwd}/.tools/clangd_17.0.3"
-            wget https://github.com/clangd/clangd/releases/download/17.0.3/clangd-linux-17.0.3.zip -qO "/tmp/clangd-linux-17.0.3.zip"
+            curl -L https://github.com/clangd/clangd/releases/download/17.0.3/clangd-linux-17.0.3.zip -o "/tmp/clangd-linux-17.0.3.zip"
             unzip -o -q "/tmp/clangd-linux-17.0.3.zip" -d "/tmp"
             cp -r "/tmp/clangd_17.0.3/." "${pwd}/.tools/clangd_17.0.3"
             rm -rf "/tmp/clangd-linux-17.0.3"
@@ -75,7 +75,7 @@ while (($#)); do
         "--cmake") # installs cmake
             [[ ! -d "${pwd}/.tools" ]] && mkdir "${pwd}/.tools"
             [[ ! -d "${pwd}/.tools/cmake-3.25" ]] && mkdir "${pwd}/.tools/cmake-3.25"
-            wget https://github.com/Kitware/CMake/releases/download/v3.25.3/cmake-3.25.3-linux-x86_64.sh -qO "/tmp/cmake-3.25.3-linux-x86_64.sh"
+            curl -L https://github.com/Kitware/CMake/releases/download/v3.25.3/cmake-3.25.3-linux-x86_64.sh -o "/tmp/cmake-3.25.3-linux-x86_64.sh"
             chmod +x "/tmp/cmake-3.25.3-linux-x86_64.sh"
             DEBIAN_FRONTEND=noninteractive /tmp/cmake-3.25.3-linux-x86_64.sh --prefix=${pwd}/.tools/cmake-3.25 --skip-license
             rm "/tmp/cmake-3.25.3-linux-x86_64.sh"

diff --git a/workspace/bin/utils/setup.sh b/workspace/bin/utils/setup.sh
@@ -99,7 +99,7 @@ while (($#)); do
             ;;
 
         "--clangd") # installs clangd 17.0.3 system wide
-            wget "https://apt.llvm.org/llvm.sh" -qO "/tmp/llvm.sh"
+            curl -L "https://apt.llvm.org/llvm.sh" -o "/tmp/llvm.sh"
             chmod u+x /tmp/llvm.sh
             /tmp/llvm.sh 17
             rm -r /tmp/llvm.sh
@@ -137,7 +137,7 @@ while (($#)); do
 
         "--powershell") # installs powershell
             update ${updateflags}
-            apt install -y wget apt-transport-https software-properties-common
+            apt install -y wget curl apt-transport-https software-properties-common
             curl -sL "https://packages.microsoft.com/config/ubuntu/$(lsb_release -rs)/packages-microsoft-prod.deb" -o /tmp/packages-microsoft-prod.deb
             dpkg -i /tmp/packages-microsoft-prod.deb
             apt update -y