get this working properly

4 files changed, 17 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 490aad84866b..e3432bbac2a6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = linux-nitrous-git
 	pkgver = 5.3.8
-	pkgrel = 12
+	pkgrel = 13
 	url = https://gitlab.com/xdevs23/linux-nitrous
 	arch = x86_64
 	license = GPL2
@@ -15,7 +15,7 @@ pkgbase = linux-nitrous-git
 	makedepends = coreutils
 	options = !strip
 	source = git+https://gitlab.com/xdevs23/linux-nitrous.git/
-	source = linux-nitrous-git.preset
+	source = linux-nitrous.preset
 	sha256sums = SKIP
 	sha256sums = 48ef93bf8f8ff236c4e2092736d0add8f87cfc5416417c50966bb296ab5933ae
 
@@ -28,7 +28,7 @@ pkgname = linux-nitrous-git
 	depends = mkinitcpio>=0.7
 	optdepends = crda: to set the correct wireless channels of your country
 	provides = linux
-	backup = etc/mkinitcpio.d/linux-nitrous-git.preset
+	backup = etc/mkinitcpio.d/linux-nitrous.preset
 
 pkgname = linux-nitrous-git-headers
 	pkgdesc = Header files and scripts for building modules for Linux kernel (git version)
diff --git a/PKGBUILD b/PKGBUILD
index 9e7d542e5eaf..693d16bc1ee4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,7 +13,7 @@
 pkgbase=linux-nitrous-git
 _srcname=linux-nitrous
 pkgver=5.3.8
-pkgrel=12
+pkgrel=13
 arch=('x86_64')
 url="https://gitlab.com/xdevs23/linux-nitrous"
 license=('GPL2')
@@ -21,7 +21,7 @@ makedepends=('clang' 'xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'git' 'libelf
 options=('!strip')
 source=('git+https://gitlab.com/xdevs23/linux-nitrous.git/'
         # standard config files for mkinitcpio ramdisk
-        "${pkgbase}.preset")
+        "${_srcname}.preset")
 sha256sums=('SKIP'
             '48ef93bf8f8ff236c4e2092736d0add8f87cfc5416417c50966bb296ab5933ae')
 
@@ -70,9 +70,9 @@ _package() {
   depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7')
   optdepends=('crda: to set the correct wireless channels of your country')
   provides=('linux')
-  backup=("etc/mkinitcpio.d/${pkgbase}.preset")
+  __kernelname=linux-nitrous
+  backup=("etc/mkinitcpio.d/linux-nitrous.preset")
   install=${pkgbase}.install
-  _kernelname=linux-nitrous
 
   cd "${_srcname}"
 
@@ -85,24 +85,24 @@ _package() {
 
   mkdir -p "${pkgdir}"/{lib/modules,lib/firmware,boot}
   make CC=clang INSTALL_MOD_PATH="${pkgdir}" modules_install
-  cp arch/$KARCH/boot/bzImage "${pkgdir}/boot/vmlinuz-${_kernelname}"
+  cp arch/$KARCH/boot/bzImage "${pkgdir}/boot/vmlinuz-${__kernelname}"
 
   # set correct depmod command for install
   cp -f "${startdir}/${install}" "${startdir}/${install}.pkg"
   true && install=${install}.pkg
   sed \
-    -e  "s/KERNEL_NAME=.*/KERNEL_NAME=${_kernelname}/" \
+    -e  "s/KERNEL_NAME=.*/KERNEL_NAME=${__kernelname}/" \
     -e  "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/" \
     -i "${startdir}/${install}"
 
   # install mkinitcpio preset file for kernel
-  install -D -m644 "${srcdir}/${pkgbase}.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
+  install -D -m644 "${srcdir}/${__kernelname}.preset" "${pkgdir}/etc/mkinitcpio.d/${__kernelname}.preset"
   sed \
     -e "1s|'linux.*'|'${pkgbase}'|" \
-    -e "s|ALL_kver=.*|ALL_kver=\"/boot/vmlinuz-${_kernelname}\"|" \
-    -e "s|default_image=.*|default_image=\"/boot/initramfs-${_kernelname}.img\"|" \
-    -e "s|fallback_image=.*|fallback_image=\"/boot/initramfs-${_kernelname}-fallback.img\"|" \
-    -i "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
+    -e "s|ALL_kver=.*|ALL_kver=\"/boot/vmlinuz-${__kernelname}\"|" \
+    -e "s|default_image=.*|default_image=\"/boot/initramfs-${__kernelname}.img\"|" \
+    -e "s|fallback_image=.*|fallback_image=\"/boot/initramfs-${__kernelname}-fallback.img\"|" \
+    -i "${pkgdir}/etc/mkinitcpio.d/${__kernelname}.preset"
 
   # remove build and source links
   rm -f "${pkgdir}"/lib/modules/${_kernver}/{source,build}
diff --git a/linux-nitrous-git.install b/linux-nitrous-git.install
index ef42413835ac..44223d17ce5a 100644
--- a/linux-nitrous-git.install
+++ b/linux-nitrous-git.install
@@ -21,7 +21,7 @@ post_upgrade() {
   echo ">>> Updating module dependencies. Please wait ..."
   depmod ${KERNEL_VERSION}
   echo ">>> Generating initial ramdisk, using mkinitcpio.  Please wait..."
-  mkinitcpio -p linux${KERNEL_NAME}
+  mkinitcpio -p ${KERNEL_NAME}
 
   if [ $(vercmp $2 3.13) -lt 0 ]; then
     echo ">>> WARNING: AT keyboard support is no longer built into the kernel."
diff --git a/linux-nitrous-git.preset b/linux-nitrous.preset
index 07480def59f5..e39a5658b31a 100644
--- a/linux-nitrous-git.preset
+++ b/linux-nitrous.preset
@@ -6,9 +6,9 @@ ALL_kver="/boot/vmlinuz-linux-nitrous-git"
 PRESETS=('default' 'fallback')
 
 #default_config="/etc/mkinitcpio.conf"
-default_image="/boot/initramfs-linux-nitrous-git.img"
+default_image="/boot/initramfs-linux-nitrous.img"
 #default_options=""
 
 #fallback_config="/etc/mkinitcpio.conf"
-fallback_image="/boot/initramfs-linux-nitrous-git-fallback.img"
+fallback_image="/boot/initramfs-linux-nitrous-fallback.img"
 fallback_options="-S autodetect"