From c4962833e83dd5b3de516fa1b123e5015515d8f5 Mon Sep 17 00:00:00 2001
From: Frede Hundewadt <fh@manjaro.org>
Date: Mon, 16 Sep 2019 20:53:01 +0200
Subject: [PATCH 1/4] Add timestamp and kernel to iso-filename

---
 lib/util-iso.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/util-iso.sh b/lib/util-iso.sh
index c74509b..bda7066 100644
--- a/lib/util-iso.sh
+++ b/lib/util-iso.sh
@@ -225,6 +225,8 @@ gen_iso_fn(){
 
     [[ ${extra} == 'false' ]] && vars+=("minimal")
 
+    vars+=("$(date +%y%m%d)")
+    vars+=("$(kernel)")
     vars+=("${target_arch}")
     for n in ${vars[@]}; do
         name=${name:-}${name:+-}${n}

From b64dd4dfeabf15731dadede6f4b0ebab7637a90e Mon Sep 17 00:00:00 2001
From: Frede Hundewadt <fh@manjaro.org>
Date: Mon, 16 Sep 2019 23:04:34 +0200
Subject: [PATCH 2/4] Omit branch in iso-filename if branch is stable Fix
 variable brackets

---
 lib/util-iso.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/util-iso.sh b/lib/util-iso.sh
index bda7066..c435ee3 100644
--- a/lib/util-iso.sh
+++ b/lib/util-iso.sh
@@ -221,12 +221,14 @@ gen_iso_fn(){
         [[ -n ${profile} ]] && vars+=("${profile}")
     fi
     vars+=("${dist_release}")
-    vars+=("${target_branch}")
+    if [[ ! ${target_branch} == "stable" ]]; then
+        vars+=("${target_branch}")
+    fi
 
     [[ ${extra} == 'false' ]] && vars+=("minimal")
 
     vars+=("$(date +%y%m%d)")
-    vars+=("$(kernel)")
+    vars+=("${kernel}")
     vars+=("${target_arch}")
     for n in ${vars[@]}; do
         name=${name:-}${name:+-}${n}

From 48415096782497b97d06be7777e2184262e14129 Mon Sep 17 00:00:00 2001
From: Frede Hundewadt <fh@manjaro.org>
Date: Tue, 17 Sep 2019 10:36:03 +0200
Subject: [PATCH 3/4] add architecture if i686 comments

---
 lib/util-iso.sh | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/lib/util-iso.sh b/lib/util-iso.sh
index c435ee3..2cc0c1e 100644
--- a/lib/util-iso.sh
+++ b/lib/util-iso.sh
@@ -221,15 +221,25 @@ gen_iso_fn(){
         [[ -n ${profile} ]] && vars+=("${profile}")
     fi
     vars+=("${dist_release}")
+    
+    # add branch if not stable
     if [[ ! ${target_branch} == "stable" ]]; then
         vars+=("${target_branch}")
     fi
 
     [[ ${extra} == 'false' ]] && vars+=("minimal")
-
+    
+    # build date
     vars+=("$(date +%y%m%d)")
+    
+    # kernel version
     vars+=("${kernel}")
-    vars+=("${target_arch}")
+    
+    # add architecture if 32-bit
+    if [[ ${target_arch} == "i686" ]]; then
+        vars+=("${target_arch}")
+    fi
+    
     for n in ${vars[@]}; do
         name=${name:-}${name:+-}${n}
     done

From 4739b2cc9819972cab525d1222e8d86095dda2cd Mon Sep 17 00:00:00 2001
From: Frede Hundewadt <fh@manjaro.org>
Date: Sat, 28 Sep 2019 11:03:57 +0200
Subject: [PATCH 4/4] Update util-iso.sh

---
 lib/util-iso.sh | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/lib/util-iso.sh b/lib/util-iso.sh
index 2cc0c1e..a9a3376 100644
--- a/lib/util-iso.sh
+++ b/lib/util-iso.sh
@@ -222,24 +222,15 @@ gen_iso_fn(){
     fi
     vars+=("${dist_release}")
     
-    # add branch if not stable
-    if [[ ! ${target_branch} == "stable" ]]; then
-        vars+=("${target_branch}")
-    fi
+    [[ ! ${target_branch} == "stable" ]] && vars+=("${target_branch}")
 
     [[ ${extra} == 'false' ]] && vars+=("minimal")
-    
-    # build date
+
     vars+=("$(date +%y%m%d)")
-    
-    # kernel version
+
     vars+=("${kernel}")
-    
-    # add architecture if 32-bit
-    if [[ ${target_arch} == "i686" ]]; then
-        vars+=("${target_arch}")
-    fi
-    
+
+    [[ ${target_arch} == "i686" ]] && vars+=("${target_arch}")    
     for n in ${vars[@]}; do
         name=${name:-}${name:+-}${n}
     done