summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe <joe@joelightning.com>2011-04-13 21:25:56 +0100
committerJoe <joe@joelightning.com>2011-04-13 21:25:56 +0100
commit7135f452dbca920b194fbb18f322283f528e6d21 (patch)
tree5c78519b704715cd8b8640e6f3fb410d4729447b
parentc3d3117db18005b667fc000b67b25589294736aa (diff)
Fixed bug were it complained about custom kernel just because the user is usingHEADmaster
the lts kernel.
-rwxr-xr-xarch2parabola13
1 files changed, 11 insertions, 2 deletions
diff --git a/arch2parabola b/arch2parabola
index 9a1951b..1e88f1d 100755
--- a/arch2parabola
+++ b/arch2parabola
@@ -30,7 +30,7 @@ blacklist='http://repo.parabolagnulinux.org/docs/blacklist.txt'
mirrorlist='http://repo.parabolagnulinux.org/files/mirrorlist'
-kernel_pkgname='kernel26'
+kernel_pkgnames=('kernel26' 'kernel26-lts')
logfile="$(pwd)/arch2parabola-$$.log"
@@ -120,7 +120,16 @@ Section 'Sanity check'
exit 1
fi
- if ! pacman -Q "$kernel_pkgname" > /dev/null 2>&1
+ for name in ${kernel_pkgnames[@]}
+ do
+ if pacman -Q "${name}" > /dev/null 2>&1
+ then
+ what_is_the_kernel="${name}"
+ break
+ fi
+ done
+
+ if (( ! what_is_the_kernel ))
then
echo >&2 'The system is running a custom kernel.'
echo >&2 'Please uninstall it before re-running this script.'