Install script should now be fully functional.

This commit is contained in:
Linus Miller 2015-11-15 20:56:39 +01:00
parent 4c92a16300
commit 0c22536cfe

View File

@ -5,13 +5,9 @@ DIR=$(dirname $(readlink -f $0));
DIRS="/boot/syslinux /etc /etc/lightdm /etc/X11/xorg.conf.d /etc/skel /usr/share/wallpapers" DIRS="/boot/syslinux /etc /etc/lightdm /etc/X11/xorg.conf.d /etc/skel /usr/share/wallpapers"
IGNORE= if lspci -k | grep -A 2 -E "(VGA|3D)" | grep -q NVIDIA; then
if lspci -k | grep -A 2 -E "(VGA|3D)" | grep -q INTEL; then
#IGNORE=/etc/X11/xorg.conf.d/20-intel.conf
IGNORE=intel IGNORE=intel
else else
#IGNORE=/etc/X11/xorg.conf.d/20-nvidia.conf
IGNORE=nvidia IGNORE=nvidia
fi fi
@ -26,15 +22,16 @@ for dir in $DIRS; do
echo "$script is a directory, skipping..." echo "$script is a directory, skipping..."
continue; continue;
elif echo "$script" | grep -q $IGNORE; then elif echo "$script" | grep -q $IGNORE; then
echo "IGNOREING"
echo "$script should be ignored, skipping..." echo "$script should be ignored, skipping..."
if [ -e "$dest" ] || [ -h "$dest" ]; then
rm -v $dest
fi
continue; continue;
elif [ -e "$dest" ]; then elif [ -e "$dest" ] || [ -h "$dest" ]; then
echo "File exists"; rm -v $dest
rm $dest
fi fi
ln -s $script $dest ln -sv $script $dest
done done
fi fi
done done