Update electron launcher scripts

3 files changed, 28 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5724647aa31f..c1813ca49922 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = electron6-bin
 	pkgdesc = Build cross platform desktop apps with web technologies - version 6 - binary version
 	pkgver = 6.1.12
-	pkgrel = 4
+	pkgrel = 5
 	url = https://electronjs.org
 	arch = x86_64
 	arch = i686
@@ -27,25 +27,25 @@ pkgbase = electron6-bin
 	provides = electron6
 	conflicts = electron6
 	source = electron-launcher.sh
-	sha512sums = e5ce4f292d5fff976efd6338c554b1dc62054ea13404154a35ef122bc655382bcd6de81fdf6936aa3cd2f1f4e7791d0fe4ae433f416ddb07b183ce7760c07b47
-	source_x86_64 = electron6-bin-chromedriver-6.1.12-4-x86_64.zip::https://github.com/electron/electron/releases/download/v6.1.12/chromedriver-v6.1.12-linux-x64.zip
-	source_x86_64 = electron6-bin-6.1.12-4-x86_64.zip::https://github.com/electron/electron/releases/download/v6.1.12/electron-v6.1.12-linux-x64.zip
+	sha512sums = bafaff764fe602996183f0a63b9aca3885bf07086fd7c7e727608b7206a9aadf3f2fe057f5f9405fb36689b85fa106fb949b3214a63009672db76a1af643f446
+	source_x86_64 = electron6-bin-chromedriver-6.1.12-x86_64.zip::https://github.com/electron/electron/releases/download/v6.1.12/chromedriver-v6.1.12-linux-x64.zip
+	source_x86_64 = electron6-bin-6.1.12-x86_64.zip::https://github.com/electron/electron/releases/download/v6.1.12/electron-v6.1.12-linux-x64.zip
 	sha512sums_x86_64 = b09e46bef6b486f32d38e5c79735f78b703db6a070142a02a5d91bd961c69272ba97ff2c3506ef45ca840b69e77cf56ba59ad7b6f1f6a5275f76adf1b6f2a851
 	sha512sums_x86_64 = 8edd32aa2b5bcdccd62f80bf7684089be480e84c8b022f8c0f99880bac3b105065814d6c5e55468bbef922bbd18d3f0db2719a9d36516f5b76f26467edebae74
-	source_i686 = electron6-bin-chromedriver-6.1.12-4-i686.zip::https://github.com/electron/electron/releases/download/v6.1.12/chromedriver-v6.1.12-linux-ia32.zip
-	source_i686 = electron6-bin-6.1.12-4-i686.zip::https://github.com/electron/electron/releases/download/v6.1.12/electron-v6.1.12-linux-ia32.zip
+	source_i686 = electron6-bin-chromedriver-6.1.12-i686.zip::https://github.com/electron/electron/releases/download/v6.1.12/chromedriver-v6.1.12-linux-ia32.zip
+	source_i686 = electron6-bin-6.1.12-i686.zip::https://github.com/electron/electron/releases/download/v6.1.12/electron-v6.1.12-linux-ia32.zip
 	sha512sums_i686 = 5720e6a69bd486555b79abcf3540c46b0472533585c2f60ed44377527b9b2751aa1b1c912e0fde6f4448bb2b4db2927dbe10bb774b8fc24845da3da89f651db0
 	sha512sums_i686 = ef74ae559ebc1ea90d954f6ae9d5b385fcd43503fcc026da3b17ae97f3409ef6d4ed2d5b7be516e082c9edb6930f097f84f6fe11e198ded2d94ad4093221cb7f
-	source_pentium4 = electron6-bin-chromedriver-6.1.12-4-pentium4.zip::https://github.com/electron/electron/releases/download/v6.1.12/chromedriver-v6.1.12-linux-ia32.zip
-	source_pentium4 = electron6-bin-6.1.12-4-pentium4.zip::https://github.com/electron/electron/releases/download/v6.1.12/electron-v6.1.12-linux-ia32.zip
+	source_pentium4 = electron6-bin-chromedriver-6.1.12-pentium4.zip::https://github.com/electron/electron/releases/download/v6.1.12/chromedriver-v6.1.12-linux-ia32.zip
+	source_pentium4 = electron6-bin-6.1.12-pentium4.zip::https://github.com/electron/electron/releases/download/v6.1.12/electron-v6.1.12-linux-ia32.zip
 	sha512sums_pentium4 = 5720e6a69bd486555b79abcf3540c46b0472533585c2f60ed44377527b9b2751aa1b1c912e0fde6f4448bb2b4db2927dbe10bb774b8fc24845da3da89f651db0
 	sha512sums_pentium4 = ef74ae559ebc1ea90d954f6ae9d5b385fcd43503fcc026da3b17ae97f3409ef6d4ed2d5b7be516e082c9edb6930f097f84f6fe11e198ded2d94ad4093221cb7f
-	source_armv7h = electron6-bin-chromedriver-6.1.12-4-armv7h.zip::https://github.com/electron/electron/releases/download/v6.1.12/chromedriver-v6.1.12-linux-armv7l.zip
-	source_armv7h = electron6-bin-6.1.12-4-armv7h.zip::https://github.com/electron/electron/releases/download/v6.1.12/electron-v6.1.12-linux-armv7l.zip
+	source_armv7h = electron6-bin-chromedriver-6.1.12-armv7h.zip::https://github.com/electron/electron/releases/download/v6.1.12/chromedriver-v6.1.12-linux-armv7l.zip
+	source_armv7h = electron6-bin-6.1.12-armv7h.zip::https://github.com/electron/electron/releases/download/v6.1.12/electron-v6.1.12-linux-armv7l.zip
 	sha512sums_armv7h = 252fe20537f370d1186c5fef7f7387d9eda7e26946456779be57cac8b00e723848cb72ee56ae2bd09b46a3a1d78b81528c72605e947fa2f9098501fa1497edd7
 	sha512sums_armv7h = ae0389bf8ccb05f1618df5da82ede0ca7782fab69d0703acf3d09bfec0b2e714c009989930dea7502ae232fe97fe0311493820398108b9dfa29d43fc51eecb43
-	source_aarch64 = electron6-bin-chromedriver-6.1.12-4-aarch64.zip::https://github.com/electron/electron/releases/download/v6.1.12/chromedriver-v6.1.12-linux-arm64.zip
-	source_aarch64 = electron6-bin-6.1.12-4-aarch64.zip::https://github.com/electron/electron/releases/download/v6.1.12/electron-v6.1.12-linux-arm64.zip
+	source_aarch64 = electron6-bin-chromedriver-6.1.12-aarch64.zip::https://github.com/electron/electron/releases/download/v6.1.12/chromedriver-v6.1.12-linux-arm64.zip
+	source_aarch64 = electron6-bin-6.1.12-aarch64.zip::https://github.com/electron/electron/releases/download/v6.1.12/electron-v6.1.12-linux-arm64.zip
 	sha512sums_aarch64 = 2303cff8a2b83e0a5f7a611f478e86335bd031cc20fc0608c1b65074a5a48bca082e19f9ebb2d3296f8379f12cec83978891746381e6e2d58ccac02e50b10d1b
 	sha512sums_aarch64 = ba9bf00bd90715fc119996268cc0527024893e380303553d5549f7e3668694eabb5f4358808b6cadb49b879c9f8722d3eafec328c671e0fbfbb907e45c5ff266
 
diff --git a/PKGBUILD b/PKGBUILD
index 1ba609c19ae0..ba26b301fc36 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ _projectname='electron'
 _pkgname="${_projectname}6"
 pkgname="$_pkgname-bin"
 pkgver='6.1.12'
-pkgrel='4'
+pkgrel='5'
 pkgdesc='Build cross platform desktop apps with web technologies - version 6 - binary version'
 arch=('x86_64' 'i686' 'pentium4' 'armv7h' 'aarch64')
 url="https://${_projectname}js.org"
@@ -20,27 +20,27 @@ optdepends=(
 )
 _releaseurl="https://github.com/$_projectname/$_projectname/releases/download/v$pkgver"
 source_x86_64=(
-	"$pkgname-chromedriver-$pkgver-$pkgrel-x86_64.zip::$_releaseurl/chromedriver-v$pkgver-linux-x64.zip"
-	"$pkgname-$pkgver-$pkgrel-x86_64.zip::$_releaseurl/$_projectname-v$pkgver-linux-x64.zip"
+	"$pkgname-chromedriver-$pkgver-x86_64.zip::$_releaseurl/chromedriver-v$pkgver-linux-x64.zip"
+	"$pkgname-$pkgver-x86_64.zip::$_releaseurl/$_projectname-v$pkgver-linux-x64.zip"
 )
 source_i686=(
-	"$pkgname-chromedriver-$pkgver-$pkgrel-i686.zip::$_releaseurl/chromedriver-v$pkgver-linux-ia32.zip"
-	"$pkgname-$pkgver-$pkgrel-i686.zip::$_releaseurl/$_projectname-v$pkgver-linux-ia32.zip"
+	"$pkgname-chromedriver-$pkgver-i686.zip::$_releaseurl/chromedriver-v$pkgver-linux-ia32.zip"
+	"$pkgname-$pkgver-i686.zip::$_releaseurl/$_projectname-v$pkgver-linux-ia32.zip"
 )
 source_pentium4=(
-	"$pkgname-chromedriver-$pkgver-$pkgrel-pentium4.zip::$_releaseurl/chromedriver-v$pkgver-linux-ia32.zip"
-	"$pkgname-$pkgver-$pkgrel-pentium4.zip::$_releaseurl/$_projectname-v$pkgver-linux-ia32.zip"
+	"$pkgname-chromedriver-$pkgver-pentium4.zip::$_releaseurl/chromedriver-v$pkgver-linux-ia32.zip"
+	"$pkgname-$pkgver-pentium4.zip::$_releaseurl/$_projectname-v$pkgver-linux-ia32.zip"
 )
 source_armv7h=(
-	"$pkgname-chromedriver-$pkgver-$pkgrel-armv7h.zip::$_releaseurl/chromedriver-v$pkgver-linux-armv7l.zip"
-	"$pkgname-$pkgver-$pkgrel-armv7h.zip::$_releaseurl/$_projectname-v$pkgver-linux-armv7l.zip"
+	"$pkgname-chromedriver-$pkgver-armv7h.zip::$_releaseurl/chromedriver-v$pkgver-linux-armv7l.zip"
+	"$pkgname-$pkgver-armv7h.zip::$_releaseurl/$_projectname-v$pkgver-linux-armv7l.zip"
 )
 source_aarch64=(
-	"$pkgname-chromedriver-$pkgver-$pkgrel-aarch64.zip::$_releaseurl/chromedriver-v$pkgver-linux-arm64.zip"
-	"$pkgname-$pkgver-$pkgrel-aarch64.zip::$_releaseurl/$_projectname-v$pkgver-linux-arm64.zip"
+	"$pkgname-chromedriver-$pkgver-aarch64.zip::$_releaseurl/chromedriver-v$pkgver-linux-arm64.zip"
+	"$pkgname-$pkgver-aarch64.zip::$_releaseurl/$_projectname-v$pkgver-linux-arm64.zip"
 )
 source=('electron-launcher.sh')
-sha512sums=('e5ce4f292d5fff976efd6338c554b1dc62054ea13404154a35ef122bc655382bcd6de81fdf6936aa3cd2f1f4e7791d0fe4ae433f416ddb07b183ce7760c07b47')
+sha512sums=('bafaff764fe602996183f0a63b9aca3885bf07086fd7c7e727608b7206a9aadf3f2fe057f5f9405fb36689b85fa106fb949b3214a63009672db76a1af643f446')
 sha512sums_x86_64=('b09e46bef6b486f32d38e5c79735f78b703db6a070142a02a5d91bd961c69272ba97ff2c3506ef45ca840b69e77cf56ba59ad7b6f1f6a5275f76adf1b6f2a851'
                    '8edd32aa2b5bcdccd62f80bf7684089be480e84c8b022f8c0f99880bac3b105065814d6c5e55468bbef922bbd18d3f0db2719a9d36516f5b76f26467edebae74')
 sha512sums_i686=('5720e6a69bd486555b79abcf3540c46b0472533585c2f60ed44377527b9b2751aa1b1c912e0fde6f4448bb2b4db2927dbe10bb774b8fc24845da3da89f651db0'
diff --git a/electron-launcher.sh b/electron-launcher.sh
index f99a738b006e..447eefc864c0 100644
--- a/electron-launcher.sh
+++ b/electron-launcher.sh
@@ -7,13 +7,13 @@ flags_file="${XDG_CONFIG_HOME:-$HOME/.config}/%%PKGNAME%%-flags.conf"
 declare -a flags
 
 if [[ -f "${flags_file}" ]]; then
-	mapfile -t < "${flags_file}"
+    mapfile -t < "${flags_file}"
 fi
 
 for line in "${MAPFILE[@]}"; do
-	if [[ ! "${line}" =~ ^[[:space:]]*#.* ]]; then
-		flags+=("${line}")
-	fi
+    if [[ ! "${line}" =~ ^[[:space:]]*#.* ]] && [[ -n "${line}" ]]; then
+        flags+=("${line}")
+    fi
 done
 
 exec /usr/lib/%%PKGNAME%%/%%PROJECTNAME%% "${flags[@]}" "$@"