From 511ca9d95d9a120e6d5eec080a23c03453e51856 Mon Sep 17 00:00:00 2001
From: nl6720 <nl6720@gmail.com>
Date: Tue, 30 Jun 2020 13:30:51 +0300
Subject: Move choose-mirror script to /usr/local/bin/

/etc/systemd/scripts/ is not a standard directory.

Run shellchek on the choose-mirror script.
---
 .gitlab-ci.yml                                     |  1 +
 .../airootfs/etc/systemd/scripts/choose-mirror     | 26 ----------------------
 .../etc/systemd/system/choose-mirror.service       |  2 +-
 .../releng/airootfs/usr/local/bin/choose-mirror    | 26 ++++++++++++++++++++++
 4 files changed, 28 insertions(+), 27 deletions(-)
 delete mode 100755 configs/releng/airootfs/etc/systemd/scripts/choose-mirror
 create mode 100755 configs/releng/airootfs/usr/local/bin/choose-mirror

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fc0eded..7481f15 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,3 +13,4 @@ lint:
         archiso/mkarchiso
         configs/{baseline,releng}/build.sh
         configs/releng/airootfs/root/.automated_script.sh
+        configs/releng/airootfs/usr/local/bin/choose-mirror
diff --git a/configs/releng/airootfs/etc/systemd/scripts/choose-mirror b/configs/releng/airootfs/etc/systemd/scripts/choose-mirror
deleted file mode 100755
index 0ae0806..0000000
--- a/configs/releng/airootfs/etc/systemd/scripts/choose-mirror
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-get_cmdline() {
-    local param
-    for param in $(< /proc/cmdline); do
-        case "${param}" in
-            $1=*) echo "${param##*=}";
-            return 0
-            ;;
-        esac
-    done
-}
-
-mirror=$(get_cmdline mirror)
-[[ $mirror = auto ]] && mirror=$(get_cmdline archiso_http_srv)
-[[ $mirror ]] || exit 0
-
-mv /etc/pacman.d/mirrorlist /etc/pacman.d/mirrorlist.orig
-cat >/etc/pacman.d/mirrorlist << EOF
-#
-# Arch Linux repository mirrorlist
-# Generated by archiso
-#
-
-Server = ${mirror%%/}/\$repo/os/\$arch
-EOF
diff --git a/configs/releng/airootfs/etc/systemd/system/choose-mirror.service b/configs/releng/airootfs/etc/systemd/system/choose-mirror.service
index 1e4d771..b6a3562 100644
--- a/configs/releng/airootfs/etc/systemd/system/choose-mirror.service
+++ b/configs/releng/airootfs/etc/systemd/system/choose-mirror.service
@@ -4,7 +4,7 @@ ConditionKernelCommandLine=mirror
 
 [Service]
 Type=oneshot
-ExecStart=/etc/systemd/scripts/choose-mirror
+ExecStart=/usr/local/bin/choose-mirror
 
 [Install]
 WantedBy=multi-user.target
diff --git a/configs/releng/airootfs/usr/local/bin/choose-mirror b/configs/releng/airootfs/usr/local/bin/choose-mirror
new file mode 100755
index 0000000..0ae0806
--- /dev/null
+++ b/configs/releng/airootfs/usr/local/bin/choose-mirror
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+get_cmdline() {
+    local param
+    for param in $(< /proc/cmdline); do
+        case "${param}" in
+            $1=*) echo "${param##*=}";
+            return 0
+            ;;
+        esac
+    done
+}
+
+mirror=$(get_cmdline mirror)
+[[ $mirror = auto ]] && mirror=$(get_cmdline archiso_http_srv)
+[[ $mirror ]] || exit 0
+
+mv /etc/pacman.d/mirrorlist /etc/pacman.d/mirrorlist.orig
+cat >/etc/pacman.d/mirrorlist << EOF
+#
+# Arch Linux repository mirrorlist
+# Generated by archiso
+#
+
+Server = ${mirror%%/}/\$repo/os/\$arch
+EOF
-- 
cgit v1.2.3-70-g09d2