From ca5b16d6a4cd94c4a7633ba62d70d2fbe7a13b2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Attila=20Sz=C3=B6ll=C5=91si?= <ata2001@airmail.cc>
Date: Sat, 17 Mar 2018 19:25:39 +0100
Subject: [PATCH] Fix regex in recovery installer (#1339)

Fixes #1322.
---
 main/postmarketos-android-recovery-installer/APKBUILD       | 4 ++--
 .../pmos_install_functions                                  | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/main/postmarketos-android-recovery-installer/APKBUILD b/main/postmarketos-android-recovery-installer/APKBUILD
index 58c7ab531..1e1d84b91 100644
--- a/main/postmarketos-android-recovery-installer/APKBUILD
+++ b/main/postmarketos-android-recovery-installer/APKBUILD
@@ -1,5 +1,5 @@
 pkgname=postmarketos-android-recovery-installer
-pkgver=0.1.5
+pkgver=0.1.6
 pkgrel=0
 pkgdesc="TWRP compatible postmarketOS installer script"
 url="https://github.com/postmarketOS"
@@ -30,5 +30,5 @@ sha512sums="924f961e1a488134d265f43724d2b06a908ac1522706dc3f7118f0dec16453aa0a92
 6390fc1b1c7dc8e917bb675d2e59e479782ac7754e97c4781866360ff704afe2d04f173a0ac74e3129db45328fab4b6b77a8717ee2e17c6ff79febadaa8ea034  update-binary
 f19c15fd99cc806d088ddf9c954111e48635f971ca500beeaa4893eb25d19fe0601210a57e9ab1a1dc7a6d79a3154765e696ee3329bbb1875b6d6df36a7b3fb3  pmos_chroot
 b932668aea823a98b7f7f3811413b1116e6444166a57f664f9b28687288e3cd39c31f5b272a632f30165b06974721a1bc880cbf7024ba091e8739ef30fcc2c6c  pmos_install
-36d8ca5ae092f8de0a9e2658581d3d1f83483b5076446aebaf5e1ab377e49615c31b81c00a23bc74d569de12a73977291c9a73e4f19b2faa694d981010c3eb35  pmos_install_functions
+514881d7812197830869c73428acc88f8a94dd02184634406ffe47884cd21d7b02ecc7806dae39308f026b1dbfca9ceee714fdfdc2bebc3ebcdeed71865de2b2  pmos_install_functions
 c6355b6d823dac883e1a352f59a9a2199e2934d78a73df72dc3c4fc14ef93765a15179203d4a8a2ca0d841b63cd4c25c4689b63c8cf4d4da2bcec1f8ff76bff5  pmos_setpw"
diff --git a/main/postmarketos-android-recovery-installer/pmos_install_functions b/main/postmarketos-android-recovery-installer/pmos_install_functions
index 6f09ca7b9..7b9ef931e 100755
--- a/main/postmarketos-android-recovery-installer/pmos_install_functions
+++ b/main/postmarketos-android-recovery-installer/pmos_install_functions
@@ -35,10 +35,10 @@ extract_partition_table() {
 		"system")
 			_INSTALL_DEVICE=$(findfs PARTLABEL="$SYSTEM_PARTLABEL") || \
 				# We need to resolve symlinks, to make set_subpartitions() work.
-				_INSTALL_DEVICE=$(readlink -fn "$(awk '/^\/system/ {print $3}' /recovery.fstab)")
+				_INSTALL_DEVICE=$(readlink -fn "$(awk '$1 == "/system" {print $3; exit;}' /recovery.fstab)")
 			;;
 		"external_sd")
-			_INSTALL_DEVICE=$(readlink -fn "$(awk '/^\/external_sd/ {print $4}' /recovery.fstab)")
+			_INSTALL_DEVICE=$(readlink -fn "$(awk '$1 == "/external_sd" {print $4; exit;}' /recovery.fstab)")
 			;;
 		*)
 			echo "No support for flashing $INSTALL_PARTITION."
@@ -61,7 +61,7 @@ extract_partition_table() {
 		INITFS_PARTITION=$(findfs PARTLABEL="$INITFS_PARTLABEL")
 	else
 		_BOOT_PARTITION=$(findfs PARTLABEL="boot") || \
-			_BOOT_PARTITION=$(awk '/^\/boot/ {print $3}' /recovery.fstab)
+			_BOOT_PARTITION=$(awk '$1 == "/boot" {print $3; exit;}' /recovery.fstab)
 		if [ ! -z "$_BOOT_PARTITION" ]
 		then
 			echo "boot partition found at $_BOOT_PARTITION"