Housekeeping resotre had a extra line and a change to restore process

This commit is contained in:
kake26 2024-08-09 15:03:49 -05:00
parent d74929f654
commit 227c83867c
Signed by: kake26
GPG key ID: E8AFC43591876B4D
4 changed files with 17 additions and 3 deletions

View file

@ -26,4 +26,14 @@ fi
# I know its so high tech and amazing right?
# We are going to do a double check here using lsb_release
if [ -x "$(command -v lsb_release)" ]; then
# osp=$(lsb_release -i | awk '{print $3}')
fi

View file

@ -30,6 +30,10 @@ function press_enter() {
clear
}
function pacman() {
command pacman --noconfirm "$@"
}
function restore_config() {
cprint 2 "Restoring system..."
sleep 1
@ -42,7 +46,7 @@ function restore_config() {
if [ -f ./exclusions ]; then
exclusions # this runs exclusions
fi
pacman -S - < $aptpkgfile
pacman --noconfirm -S - < $aptpkgfile
# we should be set app wise now the configs
#cp -Rf etc/ /etc
rsync -avh --delete --progress etc/ /etc

View file

@ -50,7 +50,7 @@ function restore_config() {
$cpapp -Rf etc/apt/ /etc
chown -R _apt /etc/apt
apt update
apt upgrade -y
apt full-upgrade -y
apt install -y rsync
# now the programs installed via apt before we restore configs
if [ -f ./exclusions ]; then

View file

@ -73,7 +73,7 @@ function copy_config() {
dpkg --get-selections > $tmpdir/installed_packages
cp ./restore.deb.bash $tmpdir/restore.bash
#apt list --installed | grep ',local]' | awk -F/ '{print $1}' >> $tmpdir/exclusions
apt list --installed | grep -q ',local]' && apt list --installed | grep ',local]' | awk -F/ '{print $1}' >> "$tmpdir/exclusions"
apt list --installed | grep ',local]' | awk -F/ '{print $1}' >> "$tmpdir/exclusions" # best way to do this
fi