[gentoo-commits] proj/hardened-patchset:master commit in: scripts/

[Anthony G. Basile]

commit:     a54d71c671e6d944bc4c4c5d9f415e734f1494fc
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat May 14 13:29:41 2016 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat May 14 13:29:41 2016 +0000
URL:        
https://gitweb.gentoo.org/proj/hardened-patchset.git/commit/?id=a54d71c6

scripts: intelligently obtain KMAJOR

 scripts/ap.patch.sh | 11 ++++-------
 scripts/re.patch.sh | 11 ++++-------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/scripts/ap.patch.sh b/scripts/ap.patch.sh
index 9ad2c24..19c4bb3 100755
--- a/scripts/ap.patch.sh
+++ b/scripts/ap.patch.sh
@@ -1,14 +1,11 @@
 #!/bin/bash
 
-SCRIPT="${0}"
-KMAJOR="${1}"
+SCRIPT="$0"
+KMAJOR="$1"
+DIRVER="$(basename $(pwd) | sed -e 's/linux-//' -e 's/-hardened.*//')"
+: ${KMAJOR:=$DIRVER}
 PATCHSET="/root/hardened-patchset/${KMAJOR}"
 
-if [[ -z "${KMAJOR}" ]] ; then
-       echo "Usage: ${SCRIPT} <kernel_major>"
-       exit
-fi
-
 if [[ ! -d ${PATCHSET} ]] ; then
        echo "Patchset ${KMAJOR} doesn't exist"
        exit

diff --git a/scripts/re.patch.sh b/scripts/re.patch.sh
index d1ac153..0daafc3 100755
--- a/scripts/re.patch.sh
+++ b/scripts/re.patch.sh
@@ -1,14 +1,11 @@
 #!/bin/bash
 
-SCRIPT="${0}"
-KMAJOR="${1}"
+SCRIPT="$0"
+KMAJOR="$1"
+DIRVER="$(basename $(pwd) | sed -e 's/linux-//' -e 's/-hardened.*//')"
+: ${KMAJOR:=$DIRVER}
 PATCHSET="/root/hardened-patchset/${KMAJOR}"
 
-if [[ -z "${KMAJOR}" ]] ; then
-       echo "Usage: ${SCRIPT} <kernel_major>"
-       exit
-fi
-
 if [[ ! -d ${PATCHSET} ]] ; then
        echo "Patchset ${KMAJOR} doesn't exist"
        exit