Shorten flags

Author: stojafil

resources/scripts/add_ppa.sh

@@ -7,11 +7,11 @@ trap 'echo "$0: \"${last_command}\" command failed with exit code $?"' ERR
 
 echo "$0: Adding MRS Testing PPA repository"
 
-sudo apt-get --no-install-recommends -o Acquire::Retries="4" -y install curl gpg dpkg-dev
+sudo apt-get --no-install-recommends -o Acquire::Retries=4 -y install curl gpg dpkg-dev
 
 ARCH=$(dpkg-architecture -qDEB_HOST_ARCH)
-sudo curl -s --compressed --retry 4 --retry-max-time 60 --retry-connrefused -o /etc/ros/rosdep/sources.list.d/ctu-mrs-testing.list "https://ctu-mrs.github.io/ppa-testing/ctu-mrs-$ARCH.list"
-curl -s --compressed --retry 4 --retry-max-time 60 --retry-connrefused https://ctu-mrs.github.io/ppa-testing/add_sources_ppa.sh | bash
+sudo curl -s --compressed --retry 4 --retry-connrefused -o /etc/ros/rosdep/sources.list.d/ctu-mrs-testing.list "https://ctu-mrs.github.io/ppa-testing/ctu-mrs-$ARCH.list"
+curl -s --compressed --retry 4 --retry-connrefused https://ctu-mrs.github.io/ppa-testing/add_sources_ppa.sh | bash
 rosdep --include-eol-distros --rosdistro=noetic update
 
 echo "$0: Finished adding MRS Testing PPA repository"

resources/scripts/add_ros_ppa.sh

@@ -7,15 +7,15 @@ trap 'echo "$0: \"${last_command}\" command failed with exit code $?"' ERR
 
 echo "$0: Adding ROS PPA"
 
-sudo apt-get -o Acquire::Retries="4" -y install wget lsb-release gnupg curl sudo
+sudo apt-get -o Acquire::Retries=4 -y install wget lsb-release gnupg curl sudo
 
 sudo sh -c 'echo "deb http://packages.ros.org/ros/ubuntu $(lsb_release -sc) main" > /etc/apt/sources.list.d/ros-latest.list'
 
-curl -s --retry 4 --retry-max-time 60 --retry-connrefused https://raw.githubusercontent.com/ros/rosdistro/master/ros.asc | sudo apt-key add -
+curl -s --retry 4 --retry-connrefused https://raw.githubusercontent.com/ros/rosdistro/master/ros.asc | sudo apt-key add -
 
-sudo apt-get -o Acquire::Retries="4" update
+sudo apt-get -o Acquire::Retries=4 update
 
-sudo apt-get -o Acquire::Retries="4" -y install python3-pip
+sudo apt-get -o Acquire::Retries=4 -y install python3-pip
 
 sudo pip3 install -U rosdep
 

resources/scripts/add_sources_ppa.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-curl -s --compressed --retry 4 --retry-max-time 60 --retry-connrefused "https://ctu-mrs.github.io/ppa-testing/ctu-mrs.gpg" | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/ctu-mrs.gpg > /dev/null
-sudo curl -s --compressed --retry 4 --retry-max-time 60 --retry-connrefused -o /etc/apt/sources.list.d/ctu-mrs-testing.list "https://ctu-mrs.github.io/ppa-testing/ctu-mrs-apt.list"
-sudo curl -s --compressed --retry 4 --retry-max-time 60 --retry-connrefused -o /etc/apt/preferences.d/ctu-mrs-testing-preferences "https://ctu-mrs.github.io/ppa-testing/ctu-mrs-ppa-preferences.txt"
+curl -s --compressed --retry 4 --retry-connrefused "https://ctu-mrs.github.io/ppa-testing/ctu-mrs.gpg" | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/ctu-mrs.gpg > /dev/null
+sudo curl -s --compressed --retry 4 --retry-connrefused -o /etc/apt/sources.list.d/ctu-mrs-testing.list "https://ctu-mrs.github.io/ppa-testing/ctu-mrs-apt.list"
+sudo curl -s --compressed --retry 4 --retry-connrefused -o /etc/apt/preferences.d/ctu-mrs-testing-preferences "https://ctu-mrs.github.io/ppa-testing/ctu-mrs-ppa-preferences.txt"
 
-sudo apt-get -o Acquire::Retries="4" update
+sudo apt-get -o Acquire::Retries=4 update

resources/scripts/remove_ppa.sh

@@ -6,7 +6,7 @@ sudo rm /etc/apt/sources.list.d/ctu-mrs-testing.list
 sudo rm /etc/apt/preferences.d/ctu-mrs-testing-preferences
 sudo rm /etc/ros/rosdep/sources.list.d/ctu-mrs-testing.list
 
-sudo apt-get -o Acquire::Retries="4" update
+sudo apt-get -o Acquire::Retries=4 update
 rosdep --include-eol-distros --rosdistro=noetic update
 
 echo "$0: Finished removing MRS Testing PPA repository"