From 1a3dd7e391778e840a52cdb43f7207d0fc66809e Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Sat, 26 Aug 2023 10:10:04 +0200 Subject: [PATCH] Bugfix --- .github/workflows/scripts/install_deps_linux_386_ssl3.sh | 2 ++ .github/workflows/scripts/install_deps_linux_arm64_ssl1.sh | 2 ++ .github/workflows/scripts/install_deps_linux_arm64_ssl3.sh | 2 ++ .github/workflows/scripts/install_deps_linux_armhf_ssl3.sh | 3 --- .github/workflows/scripts/install_deps_linux_ppc64le_ssl3.sh | 2 ++ .github/workflows/scripts/install_deps_linux_riscv64_ssl3.sh | 2 ++ 6 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/scripts/install_deps_linux_386_ssl3.sh b/.github/workflows/scripts/install_deps_linux_386_ssl3.sh index cb954f2..4f945d6 100755 --- a/.github/workflows/scripts/install_deps_linux_386_ssl3.sh +++ b/.github/workflows/scripts/install_deps_linux_386_ssl3.sh @@ -5,6 +5,8 @@ export DEBIAN_FRONTEND=noninteractive dpkg --add-architecture i386 sed 's/deb http/deb \[arch=amd64,i386\] http/' -i /etc/apt/sources.list +sed 's/deb mirror/deb \[arch=amd64,i386\] mirror/' -i /etc/apt/sources.list +[ -d "/etc/apt/sources.list.d" ] && find /etc/apt/sources.list.d -name "*.list" -type f -exec sed 's/deb http/deb \[arch=amd64,i386\] http/' -i {} \; apt-get --assume-yes update diff --git a/.github/workflows/scripts/install_deps_linux_arm64_ssl1.sh b/.github/workflows/scripts/install_deps_linux_arm64_ssl1.sh index 2d76d3b..11df8d5 100755 --- a/.github/workflows/scripts/install_deps_linux_arm64_ssl1.sh +++ b/.github/workflows/scripts/install_deps_linux_arm64_ssl1.sh @@ -5,6 +5,8 @@ export DEBIAN_FRONTEND=noninteractive dpkg --add-architecture arm64 sed 's/deb http/deb \[arch=amd64,i386\] http/' -i /etc/apt/sources.list +sed 's/deb mirror/deb \[arch=amd64,i386\] mirror/' -i /etc/apt/sources.list +[ -d "/etc/apt/sources.list.d" ] && find /etc/apt/sources.list.d -name "*.list" -type f -exec sed 's/deb http/deb \[arch=amd64,i386\] http/' -i {} \; echo "# tdlight multiarch" > /etc/apt/sources.list.d/tdlight-multiarch.list echo "deb [arch=arm64,armhf,ppc64el,riscv64,s390x] http://ports.ubuntu.com/ $(lsb_release -cs) main universe restricted multiverse" >> /etc/apt/sources.list.d/tdlight-multiarch.list echo "deb [arch=arm64,armhf,ppc64el,riscv64,s390x] http://ports.ubuntu.com/ $(lsb_release -cs)-updates main universe restricted multiverse" >> /etc/apt/sources.list.d/tdlight-multiarch.list diff --git a/.github/workflows/scripts/install_deps_linux_arm64_ssl3.sh b/.github/workflows/scripts/install_deps_linux_arm64_ssl3.sh index 56ac133..38bd3a1 100755 --- a/.github/workflows/scripts/install_deps_linux_arm64_ssl3.sh +++ b/.github/workflows/scripts/install_deps_linux_arm64_ssl3.sh @@ -5,6 +5,8 @@ export DEBIAN_FRONTEND=noninteractive dpkg --add-architecture arm64 sed 's/deb http/deb \[arch=amd64,i386\] http/' -i /etc/apt/sources.list +sed 's/deb mirror/deb \[arch=amd64,i386\] mirror/' -i /etc/apt/sources.list +[ -d "/etc/apt/sources.list.d" ] && find /etc/apt/sources.list.d -name "*.list" -type f -exec sed 's/deb http/deb \[arch=amd64,i386\] http/' -i {} \; echo "# tdlight multiarch" > /etc/apt/sources.list.d/tdlight-multiarch.list echo "deb [arch=arm64,armhf,ppc64el,riscv64,s390x] http://ports.ubuntu.com/ $(lsb_release -cs) main universe restricted multiverse" >> /etc/apt/sources.list.d/tdlight-multiarch.list echo "deb [arch=arm64,armhf,ppc64el,riscv64,s390x] http://ports.ubuntu.com/ $(lsb_release -cs)-updates main universe restricted multiverse" >> /etc/apt/sources.list.d/tdlight-multiarch.list diff --git a/.github/workflows/scripts/install_deps_linux_armhf_ssl3.sh b/.github/workflows/scripts/install_deps_linux_armhf_ssl3.sh index d987543..887cd50 100755 --- a/.github/workflows/scripts/install_deps_linux_armhf_ssl3.sh +++ b/.github/workflows/scripts/install_deps_linux_armhf_ssl3.sh @@ -4,9 +4,6 @@ export DEBIAN_FRONTEND=noninteractive dpkg --add-architecture armhf -cat /etc/apt/sources.list -cat /etc/apt/apt-mirrors.txt -[ -d "/etc/apt/sources.list.d" ] && find /etc/apt/sources.list.d -name "*.list" -type f -exec cat {} \; sed 's/deb http/deb \[arch=amd64,i386\] http/' -i /etc/apt/sources.list sed 's/deb mirror/deb \[arch=amd64,i386\] mirror/' -i /etc/apt/sources.list [ -d "/etc/apt/sources.list.d" ] && find /etc/apt/sources.list.d -name "*.list" -type f -exec sed 's/deb http/deb \[arch=amd64,i386\] http/' -i {} \; diff --git a/.github/workflows/scripts/install_deps_linux_ppc64le_ssl3.sh b/.github/workflows/scripts/install_deps_linux_ppc64le_ssl3.sh index 1f8288a..62f1031 100755 --- a/.github/workflows/scripts/install_deps_linux_ppc64le_ssl3.sh +++ b/.github/workflows/scripts/install_deps_linux_ppc64le_ssl3.sh @@ -5,6 +5,8 @@ export DEBIAN_FRONTEND=noninteractive dpkg --add-architecture ppc64el sed 's/deb http/deb \[arch=amd64,i386\] http/' -i /etc/apt/sources.list +sed 's/deb mirror/deb \[arch=amd64,i386\] mirror/' -i /etc/apt/sources.list +[ -d "/etc/apt/sources.list.d" ] && find /etc/apt/sources.list.d -name "*.list" -type f -exec sed 's/deb http/deb \[arch=amd64,i386\] http/' -i {} \; echo "# tdlight multiarch" > /etc/apt/sources.list.d/tdlight-multiarch.list echo "deb [arch=arm64,armhf,ppc64el,riscv64,s390x] http://ports.ubuntu.com/ $(lsb_release -cs) main universe restricted multiverse" >> /etc/apt/sources.list.d/tdlight-multiarch.list echo "deb [arch=arm64,armhf,ppc64el,riscv64,s390x] http://ports.ubuntu.com/ $(lsb_release -cs)-updates main universe restricted multiverse" >> /etc/apt/sources.list.d/tdlight-multiarch.list diff --git a/.github/workflows/scripts/install_deps_linux_riscv64_ssl3.sh b/.github/workflows/scripts/install_deps_linux_riscv64_ssl3.sh index cbda2de..70002ce 100755 --- a/.github/workflows/scripts/install_deps_linux_riscv64_ssl3.sh +++ b/.github/workflows/scripts/install_deps_linux_riscv64_ssl3.sh @@ -5,6 +5,8 @@ export DEBIAN_FRONTEND=noninteractive dpkg --add-architecture riscv64 sed 's/deb http/deb \[arch=amd64,i386\] http/' -i /etc/apt/sources.list +sed 's/deb mirror/deb \[arch=amd64,i386\] mirror/' -i /etc/apt/sources.list +[ -d "/etc/apt/sources.list.d" ] && find /etc/apt/sources.list.d -name "*.list" -type f -exec sed 's/deb http/deb \[arch=amd64,i386\] http/' -i {} \; echo "# tdlight multiarch" > /etc/apt/sources.list.d/tdlight-multiarch.list echo "deb [arch=arm64,armhf,ppc64el,riscv64,s390x] http://ports.ubuntu.com/ $(lsb_release -cs) main universe restricted multiverse" >> /etc/apt/sources.list.d/tdlight-multiarch.list echo "deb [arch=arm64,armhf,ppc64el,riscv64,s390x] http://ports.ubuntu.com/ $(lsb_release -cs)-updates main universe restricted multiverse" >> /etc/apt/sources.list.d/tdlight-multiarch.list