From 3d2d61c21a8e7feeab4e9750c0ab2507e852c073 Mon Sep 17 00:00:00 2001 From: MrUnknownDE Date: Wed, 23 Feb 2022 02:47:20 +0100 Subject: [PATCH] fix distro_check --- sh_scripts/official_repo.sh | 48 +++++++++++++++------------------- sh_scripts/repos/debian-10.txt | 13 +++++---- sh_scripts/repos/debian-9.txt | 12 ++++----- 3 files changed, 33 insertions(+), 40 deletions(-) diff --git a/sh_scripts/official_repo.sh b/sh_scripts/official_repo.sh index 3eb7328..3611613 100644 --- a/sh_scripts/official_repo.sh +++ b/sh_scripts/official_repo.sh @@ -1,5 +1,5 @@ #!/bin/bash -SYSTEM=$(cat /etc/*-release | grep "VERSION_ID=") +SYSTEM=$(lsb_release -sr) # Make sure only root can run our script if [ "$(id -u)" != "0" ]; then echo "This script must be run as root" 1>&2 @@ -30,45 +30,39 @@ echo "" echo "" echo "LETS GO!" -if [ $SYSTEM = 11 ]; then - apt-get update - apt-get install curl wget apt-transport-https dirmngr neofetch htop nload git -y +if [ "$SYSTEM" == "11" ]; then curl "https://raw.githubusercontent.com/MrUnknownDE/linux-script/main/sh_scripts/repos/debian-11.txt" -o /etc/apt/sources.list apt-get update && apt-get upgrade -y + apt-get install curl wget apt-transport-https dirmngr neofetch htop nload git -y echo "Have Fun with the Official Repos :)" fi -if [ $SYSTEM = 10 ]; then - apt-get update - apt-get install curl wget apt-transport-https dirmngr neofetch htop nload git -y +if [ "$SYSTEM" == "10" ]; then curl "https://raw.githubusercontent.com/MrUnknownDE/linux-script/main/sh_scripts/repos/debian-10.txt" -o /etc/apt/sources.list apt-get update && apt-get upgrade -y + apt-get install curl wget apt-transport-https dirmngr neofetch htop nload git -y echo "Have Fun with the Official Repos :)" fi -if [ $SYSTEM = 9 ]; then - apt-get update - apt-get install curl wget apt-transport-https dirmngr neofetch htop nload git -y +if [ "$SYSTEM" == "9" ]; then curl "https://raw.githubusercontent.com/MrUnknownDE/linux-script/main/sh_scripts/repos/debian-9.txt" -o /etc/apt/sources.list apt-get update && apt-get upgrade -y + apt-get install curl wget apt-transport-https dirmngr neofetch htop nload git -y echo "Have Fun with the Official Repos :)" fi -if [ $SYSTEM = Ubuntu 18.04 ]; then - apt-get update - apt-get install curl wget apt-transport-https dirmngr neofetch htop nload git -y - curl "https://raw.githubusercontent.com/MrUnknownDE/linux-script/main/sh_scripts/repos/ubuntu-18.04.txt" -o /etc/apt/sources.list - apt-get update && apt-get upgrade -y - echo "Have Fun with the Official Repos :)" -fi -if [ $SYSTEM = Ubuntu 16.04 ]; then - apt-get update - apt-get install curl wget apt-transport-https dirmngr neofetch htop nload git -y - curl "https://raw.githubusercontent.com/MrUnknownDE/linux-script/main/sh_scripts/repos/ubuntu-16.04.txt" -o /etc/apt/sources.list - apt-get update && apt-get upgrade -y - echo "Have Fun with the Official Repos :)" -fi -if [ $SYSTEM = Ubuntu 20.04 ]; then - apt-get update - apt-get install curl wget apt-transport-https dirmngr neofetch htop nload git -y +if [ "$SYSTEM" == "20.04" ]; then curl "https://raw.githubusercontent.com/MrUnknownDE/linux-script/main/sh_scripts/repos/ubuntu-20.04.txt" -o /etc/apt/sources.list apt-get update && apt-get upgrade -y + apt-get install curl wget apt-transport-https dirmngr neofetch htop nload git -y + echo "Have Fun with the Official Repos :)" +fi +if [ "$SYSTEM" == "18.04" ]; then + curl "https://raw.githubusercontent.com/MrUnknownDE/linux-script/main/sh_scripts/repos/ubuntu-18.04.txt" -o /etc/apt/sources.list + apt-get update && apt-get upgrade -y + apt-get install curl wget apt-transport-https dirmngr neofetch htop nload git -y + echo "Have Fun with the Official Repos :)" +fi +if [ "$SYSTEM" == "16.04" ]; then + curl "https://raw.githubusercontent.com/MrUnknownDE/linux-script/main/sh_scripts/repos/ubuntu-16.04.txt" -o /etc/apt/sources.list + apt-get update && apt-get upgrade -y + apt-get install curl wget apt-transport-https dirmngr neofetch htop nload git -y echo "Have Fun with the Official Repos :)" fi \ No newline at end of file diff --git a/sh_scripts/repos/debian-10.txt b/sh_scripts/repos/debian-10.txt index 46e90dc..6c379f6 100644 --- a/sh_scripts/repos/debian-10.txt +++ b/sh_scripts/repos/debian-10.txt @@ -2,15 +2,14 @@ # OFFICIAL DEBIAN REPOS # #------------------------------------------------------------------------------# -###### Debian Main Repos -deb http://deb.debian.org/debian/ stable main contrib non-free -deb-src http://deb.debian.org/debian/ stable main contrib non-free +deb http://deb.debian.org/debian/ buster main +deb-src http://deb.debian.org/debian/ buster main -deb http://deb.debian.org/debian/ stable-updates main contrib non-free -deb-src http://deb.debian.org/debian/ stable-updates main contrib non-free +deb http://deb.debian.org/debian/ buster-updates main +deb-src http://deb.debian.org/debian/ buster-updates main -deb http://deb.debian.org/debian-security stable/updates main -deb-src http://deb.debian.org/debian-security stable/updates main +deb http://security.debian.org/debian-security buster/updates main +deb-src http://security.debian.org/debian-security buster/updates main deb http://ftp.debian.org/debian buster-backports main deb-src http://ftp.debian.org/debian buster-backports main \ No newline at end of file diff --git a/sh_scripts/repos/debian-9.txt b/sh_scripts/repos/debian-9.txt index 17838d7..86484fc 100644 --- a/sh_scripts/repos/debian-9.txt +++ b/sh_scripts/repos/debian-9.txt @@ -3,14 +3,14 @@ #------------------------------------------------------------------------------# ###### Debian Main Repos -deb http://deb.debian.org/debian/ oldstable main contrib non-free -deb-src http://deb.debian.org/debian/ oldstable main contrib non-free +deb http://deb.debian.org/debian/ stretch main contrib non-free +deb-src http://deb.debian.org/debian/ stretch main contrib non-free -deb http://deb.debian.org/debian/ oldstable-updates main contrib non-free -deb-src http://deb.debian.org/debian/ oldstable-updates main contrib non-free +deb http://deb.debian.org/debian/ stretch-updates main contrib non-free +deb-src http://deb.debian.org/debian/stretch-updates main contrib non-free -deb http://deb.debian.org/debian-security oldstable/updates main -deb-src http://deb.debian.org/debian-security oldstable/updates main +deb http://deb.debian.org/debian-security stretch/updates main +deb-src http://deb.debian.org/debian-security stretch/updates main deb http://ftp.debian.org/debian stretch-backports main deb-src http://ftp.debian.org/debian stretch-backports main \ No newline at end of file