Split a script in two

Author: hmlendea

run.sh

@@ -81,7 +81,10 @@ if [ "${OS}" = 'Linux' ] \
 fi
 
 run_script "${REPO_SCRIPTS_DIR}/configure-permissions.sh" # Run after install-packages.sh
-[ "${OS}" = 'Linux' ] && run_script_as_su "${REPO_SCRIPTS_DIR}/set-system-locale-timedate.sh"
+if [ "${OS}" = 'Linux' ]; then
+    run_script_as_su "${REPO_SCRIPTS_DIR}/configure-locale.sh"
+    run_script_as_su "${REPO_SCRIPTS_DIR}/configure-system-time.sh"
+fi
 [ "${DISTRO_FAMILY}" != 'Android' ] && run_script_as_su "${REPO_SCRIPTS_DIR}/update-profiles.sh"
 
 if [ "${OS}" = 'Linux' ]; then

scripts/set-system-locale-timedate.sh scripts/configure-locale.shscripts/set-system-locale-timedate.sh renamed to scripts/configure-locale.sh

@@ -5,7 +5,6 @@ source "${REPO_SCRIPTS_COMMON_DIR}/system-info.sh"
 LOCALE_GEN_FILE_PATH="${ROOT_ETC}/locale.gen"
 LOCALE_CONF_FILE_PATH="${ROOT_ETC}/locale.conf"
 VCONSOLE_CONF_FILE_PATH="${ROOT_ETC}/vconsole.conf"
-LOCALTIME_FILE_PATH="${ROOT_ETC}/localtime"
 KEYBOARD_LAYOUTS_PATH="${ROOT_USR_SHARE}/X11/xkb/symbols"
 
 echo 'Setting up the console font and keymap...'
@@ -24,7 +23,6 @@ echo 'Setting up the language...'
     echo 'LC_NAME=ro_RO.UTF-8'
     echo 'LC_NUMERIC=ro_RO.UTF-8'
     echo 'LC_TIME=ro_RO.UTF-8'
-} > "${LOCALE_CONF_FILE_PATH}"
 
 echo 'en_GB.UTF-8 UTF-8' >  "${LOCALE_GEN_FILE_PATH}"
 echo 'en_US.UTF-8 UTF-8' >> "${LOCALE_GEN_FILE_PATH}"
@@ -38,13 +36,6 @@ for LOCALE in $(awk '{print $1}' "${LOCALE_GEN_FILE_PATH}" | sed -e 's/\([^\.]*\
     fi
 done
 
-if [ ! -f "${LOCALTIME_FILE_PATH}" ]; then
-    echo 'Setting up the local time...'
-
-    ln -sf '/usr/share/zoneinfo/Europe/Bucharest' "${LOCALTIME_FILE_PATH}"
-    does_bin_exist 'hwclock' && hwclock --systohc
-fi
-
 # Update the X11 keyboard layout definitions
 if ${HAS_GUI}; then
     if [ -d "${KEYBOARD_LAYOUTS_PATH}" ]; then

scripts/configure-system-time.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+source 'scripts/common/filesystem.sh'
+
+LOCALE_CONF_FILE_PATH="${ROOT_ETC}/locale.conf"
+LOCALTIME_FILE_PATH="${ROOT_ETC}/localtime"
+
+echo 'Setting up the time locale...'
+{
+    echo 'LC_TIME=ro_RO.UTF-8'
+} > "${LOCALE_CONF_FILE_PATH}"
+
+if [ ! -f "${LOCALTIME_FILE_PATH}" ]; then
+    echo 'Setting up the local time...'
+
+    ln -sf '/usr/share/zoneinfo/Europe/Bucharest' "${LOCALTIME_FILE_PATH}"
+    does_bin_exist 'hwclock' && hwclock --systohc
+fi