diff --git a/files/debian/debian-essentials.sh b/files/debian/debian-essentials.sh index 330807c..0933eed 100755 --- a/files/debian/debian-essentials.sh +++ b/files/debian/debian-essentials.sh @@ -8,41 +8,25 @@ if [[ ! -f /etc/apt/apt.conf.d/local ]] ; then echo "}" >> /etc/apt/apt.conf.d/local fi -# make mirrors directoy -if [[ ! -d /etc/apt/mirrors ]] ; then - mkdir /etc/apt/mirrors +# update bookworm to new debian.sources file +isInFile=$(cat /etc/apt/sources.list | grep -c "bookworm") +if [ $isInFile -eq 1 ]; then + mkdir /etc/apt/mirrors + echo "https://deb.debian.org/debian" >> /etc/apt/mirrors/debian.list + echo "https://deb.debian.org/debian-security" >> /etc/apt/mirrors/debian-security.list + echo "Types: deb deb-src" >> /etc/apt/sources.list.d/debian.sources + echo "URIs: mirror+file:///etc/apt/mirrors/debian.list" >> /etc/apt/sources.list.d/debian.sources + echo "Suites: bookworm bookworm-updates bookworm-backports" >> /etc/apt/sources.list.d/debian.sources + echo "Components: main contrib non-free non-free-firmware" >> /etc/apt/sources.list.d/debian.sources + echo "" >> /etc/apt/sources.list.d/debian.sources + echo "Types: deb deb-src" >> /etc/apt/sources.list.d/debian.sources + echo "URIs: mirror+file:///etc/apt/mirrors/debian-security.list" >> /etc/apt/sources.list.d/debian.sources + echo "Suites: bookworm-security" >> /etc/apt/sources.list.d/debian.sources + echo "Components: main" >> /etc/apt/sources.list.d/debian.sources + mv /etc/apt/sources.list /etc/apt/sources.list.bak + rm /etc/apt/sources.list.11.backup > /dev/null 2>&1 fi -# create mirror sources -if [[ ! -f /etc/apt/mirrors/debian.list ]] ; then - echo "https://deb.debian.org/debian" >> /etc/apt/mirrors/debian.list -fi - -if [[ ! -f /etc/apt/mirrors/debian-security.list ]] ; then - echo "https://deb.debian.org/debian-security" >> /etc/apt/mirrors/debian-security.list -fi - -# create debian.sources -if [[ ! -f /etc/apt/sources.list.d/debian.sources ]] ; then - echo "Types: deb deb-src" >> /etc/apt/sources.list.d/debian.sources - echo "URIs: mirror+file:///etc/apt/mirrors/debian.list" >> /etc/apt/sources.list.d/debian.sources - echo "Suites: bookworm bookworm-updates bookworm-backports" >> /etc/apt/sources.list.d/debian.sources - echo "Components: main contrib non-free non-free-firmware" >> /etc/apt/sources.list.d/debian.sources - echo "" >> /etc/apt/sources.list.d/debian.sources - echo "Types: deb deb-src" >> /etc/apt/sources.list.d/debian.sources - echo "URIs: mirror+file:///etc/apt/mirrors/debian-security.list" >> /etc/apt/sources.list.d/debian.sources - echo "Suites: bookworm-security" >> /etc/apt/sources.list.d/debian.sources - echo "Components: main" >> /etc/apt/sources.list.d/debian.sources -fi - -# backup sources.list -if [[ ! -f /etc/apt/sources.list.bak ]] ; then - mv /etc/apt/sources.list /etc/apt/sources.list.bak -fi - -# remove other sources.list backup -rm /etc/apt/sources.list.11.backup > /dev/null 2>&1 - # update and upgrade apt-get update apt-get upgrade -y @@ -113,7 +97,7 @@ cp /etc/bash.bashrc.bak /etc/bash.bashrc echo "" >> /etc/bash.bashrc echo "# custom settings and aliases" >> /etc/bash.bashrc echo "set -o noclobber" >> /etc/bash.bashrc -echo "alias lsa='ls -alhF'" >> /etc/bash.bashrc +echo "alias lsa='ls -alhvF'" >> /etc/bash.bashrc echo "alias systart='sudo systemctl start'" >> /etc/bash.bashrc echo "alias systop='sudo systemctl stop'" >> /etc/bash.bashrc echo "alias sysrest='sudo systemctl restart'" >> /etc/bash.bashrc diff --git a/files/debian/debian-sources-update.sh b/files/debian/debian-sources-update.sh index 53b011d..6c67b54 100644 --- a/files/debian/debian-sources-update.sh +++ b/files/debian/debian-sources-update.sh @@ -1,33 +1,19 @@ #!/bin/bash -# make mirrors directoy -if [[ ! -d /etc/apt/mirrors ]] ; then - mkdir /etc/apt/mirrors -fi - -# create mirror sources -if [[ ! -f /etc/apt/mirrors/debian.list ]] ; then - echo "https://deb.debian.org/debian" >> /etc/apt/mirrors/debian.list -fi - -if [[ ! -f /etc/apt/mirrors/debian-security.list ]] ; then - echo "https://deb.debian.org/debian-security" >> /etc/apt/mirrors/debian-security.list -fi - -# create debian.sources -if [[ ! -f /etc/apt/sources.list.d/debian.sources ]] ; then - echo "Types: deb deb-src" >> /etc/apt/sources.list.d/debian.sources - echo "URIs: mirror+file:///etc/apt/mirrors/debian.list" >> /etc/apt/sources.list.d/debian.sources - echo "Suites: bookworm bookworm-updates bookworm-backports" >> /etc/apt/sources.list.d/debian.sources - echo "Components: main contrib non-free non-free-firmware" >> /etc/apt/sources.list.d/debian.sources - echo "" >> /etc/apt/sources.list.d/debian.sources - echo "Types: deb deb-src" >> /etc/apt/sources.list.d/debian.sources - echo "URIs: mirror+file:///etc/apt/mirrors/debian-security.list" >> /etc/apt/sources.list.d/debian.sources - echo "Suites: bookworm-security" >> /etc/apt/sources.list.d/debian.sources - echo "Components: main" >> /etc/apt/sources.list.d/debian.sources -fi - -# backup sources.list -if [[ ! -f /etc/apt/sources.list.bak ]] ; then - mv /etc/apt/sources.list /etc/apt/sources.list.bak +isInFile=$(cat /etc/apt/sources.list | grep -c "bookworm") +if [ $isInFile -eq 1 ]; then + mkdir /etc/apt/mirrors + echo "https://deb.debian.org/debian" >> /etc/apt/mirrors/debian.list + echo "https://deb.debian.org/debian-security" >> /etc/apt/mirrors/debian-security.list + echo "Types: deb deb-src" >> /etc/apt/sources.list.d/debian.sources + echo "URIs: mirror+file:///etc/apt/mirrors/debian.list" >> /etc/apt/sources.list.d/debian.sources + echo "Suites: bookworm bookworm-updates bookworm-backports" >> /etc/apt/sources.list.d/debian.sources + echo "Components: main contrib non-free non-free-firmware" >> /etc/apt/sources.list.d/debian.sources + echo "" >> /etc/apt/sources.list.d/debian.sources + echo "Types: deb deb-src" >> /etc/apt/sources.list.d/debian.sources + echo "URIs: mirror+file:///etc/apt/mirrors/debian-security.list" >> /etc/apt/sources.list.d/debian.sources + echo "Suites: bookworm-security" >> /etc/apt/sources.list.d/debian.sources + echo "Components: main" >> /etc/apt/sources.list.d/debian.sources + mv /etc/apt/sources.list /etc/apt/sources.list.bak + rm /etc/apt/sources.list.11.backup > /dev/null 2>&1 fi