From 360d581084a0e06de84ea6f5b0588d8f0444a787 Mon Sep 17 00:00:00 2001 From: ENGO150 Date: Thu, 9 Jan 2025 15:08:34 +0100 Subject: [PATCH] replaced apt usage with apt-get MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit No money, no girls, denied Can you fuckin’ believe it? Oh, oh, oh, oh, oh --- .github/workflows/why2-chat-build.yml | 6 +++--- .github/workflows/why2-core-test.yml | 8 ++++---- .github/workflows/why2-logger-test.yml | 8 ++++---- .github/workflows/why2-project.yml | 6 +++--- .gitlab-ci.yml | 16 ++++++++-------- configure.sh | 2 +- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.github/workflows/why2-chat-build.yml b/.github/workflows/why2-chat-build.yml index 954a218..82c60a9 100644 --- a/.github/workflows/why2-chat-build.yml +++ b/.github/workflows/why2-chat-build.yml @@ -45,8 +45,8 @@ jobs: - if: matrix.os == 'ubuntu-latest' name: Update packages run: | - sudo apt update -# sudo apt upgrade + sudo apt-get update +# sudo apt-get upgrade - name: Permissions run: chmod +x ${{ matrix.configure }} @@ -54,7 +54,7 @@ jobs: - name: Preparation run: sudo ./${{ matrix.configure }} - - name: Set up Rust + - name: Set up Rust # Normally works with configure.sh, but gitea has some beef with cargo idk uses: dtolnay/rust-toolchain@stable - name: Install WHY2 diff --git a/.github/workflows/why2-core-test.yml b/.github/workflows/why2-core-test.yml index 3ec967e..c599d6a 100644 --- a/.github/workflows/why2-core-test.yml +++ b/.github/workflows/why2-core-test.yml @@ -46,8 +46,8 @@ jobs: - if: matrix.os == 'ubuntu-latest' name: Update packages run: | - sudo apt update -# sudo apt upgrade + sudo apt-get update +# sudo apt-get upgrade - name: Permissions run: chmod +x ${{ matrix.configure }} @@ -56,9 +56,9 @@ jobs: run: sudo ./${{ matrix.configure }} - name: Install Valgrind - run: DEBIAN_FRONTEND=noninteractive sudo apt install valgrind + run: sudo apt-get install valgrind -y - - name: Set up Rust + - name: Set up Rust # Normally works with configure.sh, but gitea has some beef with cargo idk uses: dtolnay/rust-toolchain@stable - name: Install WHY2 diff --git a/.github/workflows/why2-logger-test.yml b/.github/workflows/why2-logger-test.yml index 72f4045..0661ac3 100644 --- a/.github/workflows/why2-logger-test.yml +++ b/.github/workflows/why2-logger-test.yml @@ -46,8 +46,8 @@ jobs: - if: matrix.os == 'ubuntu-latest' name: Update packages run: | - sudo apt update -# sudo apt upgrade + sudo apt-get update +# sudo apt-get upgrade - name: Permissions run: chmod +x ${{ matrix.configure }} @@ -56,9 +56,9 @@ jobs: run: sudo ./${{ matrix.configure }} - name: Install Valgrind - run: DEBIAN_FRONTEND=noninteractive sudo apt install valgrind + run: sudo apt-get install valgrind -y - - name: Set up Rust + - name: Set up Rust # Normally works with configure.sh, but gitea has some beef with cargo idk uses: dtolnay/rust-toolchain@stable - name: Install WHY2 diff --git a/.github/workflows/why2-project.yml b/.github/workflows/why2-project.yml index 6660119..12a740c 100644 --- a/.github/workflows/why2-project.yml +++ b/.github/workflows/why2-project.yml @@ -42,8 +42,8 @@ jobs: - if: matrix.os == 'ubuntu-latest' name: Update packages run: | - sudo apt update -# sudo apt upgrade + sudo apt-get update +# sudo apt-get upgrade - name: Permissions run: | @@ -52,7 +52,7 @@ jobs: - name: Preparation run: sudo ./${{ matrix.configure }} - - name: Set up Rust + - name: Set up Rust # Normally works with configure.sh, but gitea has some beef with cargo idk uses: dtolnay/rust-toolchain@stable - name: Install WHY2 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d369534..b3b11d7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,8 +27,8 @@ why2-chat-build: stage: build image: rust:latest # Fixes cargo installation problems in ./configure.sh script: - - apt update # Update repos - - apt install sudo lsb-release -y # Install needed stuff + - apt-get update # Update repos + - apt-get install sudo lsb-release -y # Install needed stuff - chmod +x configure.sh # Permissions - sudo ./configure.sh # Preparation - make install BYPASS_CHECK=true # Install WHY2 @@ -42,8 +42,8 @@ why2-core-test: stage: build image: rust:latest script: - - apt update # Update repos - - apt install sudo lsb-release valgrind -y # Install needed stuff + - apt-get update # Update repos + - apt-get install sudo lsb-release valgrind -y # Install needed stuff - chmod +x configure.sh # Permissions - sudo ./configure.sh # Preparation - make install BYPASS_CHECK=true # Install WHY2 @@ -56,8 +56,8 @@ why2-logger-test: stage: build image: rust:latest script: - - apt update # Update repos - - apt install sudo lsb-release valgrind -y # Install needed stuff + - apt-get update # Update repos + - apt-get install sudo lsb-release valgrind -y # Install needed stuff - chmod +x configure.sh # Permissions - sudo ./configure.sh # Preparation - make install BYPASS_CHECK=true # Install WHY2 @@ -70,8 +70,8 @@ why2-project: stage: build image: rust:latest script: - - apt update # Update repos - - apt install sudo lsb-release -y # Install needed stuff + - apt-get update # Update repos + - apt-get install sudo lsb-release -y # Install needed stuff - chmod +x configure.sh # Permissions - sudo ./configure.sh # Preparation - make install BYPASS_CHECK=true # Install WHY2 diff --git a/configure.sh b/configure.sh index bb78d13..4e2f14c 100755 --- a/configure.sh +++ b/configure.sh @@ -31,7 +31,7 @@ ARCH_GENTOO_COMMON="$COMMON json-c libgit2 gmp openssl" if [[ $DISTRO == "Arch" ]]; then COMMAND="pacman -S --needed --noconfirm $ARCH_GENTOO_COMMON" elif [[ $DISTRO == "Ubuntu" ]] || [[ $DISTRO == "Debian" ]]; then - COMMAND="apt install -y $COMMON libjson-c-dev libcurl4-nss-dev libgit2-dev libgmp-dev libssl-dev" + COMMAND="apt-get install -y $COMMON libjson-c-dev libcurl4-nss-dev libgit2-dev libgmp-dev libssl-dev" elif [[ $DISTRO == "Gentoo" ]]; then COMMAND="emerge -vn $ARCH_GENTOO_COMMON"