gentoo/helper
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gentooup: cleanup failed merge

Browse source
This commit is contained in:
layman 2022-03-28 23:47:29 +02:00
parent a87157013d
commit 87549429c3
1 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gentooup.sh
View file

@ -138,17 +138,12 @@ if [[ $(qlist -I gentoo-sources) != "" ]] ; then
myemerge "${PORTAGE_OPTIONS[@]}" --deselect gentoo-sources:"${CURRENTKERNELVERSION/"-gentoo"/}"
fi
<<<<<<< Updated upstream
if [[ -n "$(which restart-services)" && $CHROOTED == "1" ]] ; then
restart-services -l
=======
if [[ -n "$(which updateEfiStubsAndBootManager.sh)" && $CHROOTED == "1" ]] ; then
updateEfiStubsAndBootManager.sh
fi
if [[ -n "$(which restart_services)" && $CHROOTED == "1" ]] ; then
restart_services -l
>>>>>>> Stashed changes
fi
echo "Started at $STARTDATE"
echo " Ended at $(date -Iseconds)"