root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-20 03:50:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

change single = to double ==

Browse source
This commit is contained in:
Tobias Powalowski 2023-01-01 17:22:00 +01:00
parent 7e4c80bc26
commit 48c46611fb
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
usr/lib/archboot/installer/network.sh
View file

@ -39,7 +39,7 @@ do_wireless() {
"Hidden" "_" 2>"${ANSWER}" || return 1 "Hidden" "_" 2>"${ANSWER}" || return 1
WLAN_SSID=$(cat "${ANSWER}") WLAN_SSID=$(cat "${ANSWER}")
WLAN_CONNECT="connect" WLAN_CONNECT="connect"
if [[ "${WLAN_SSID}" = "Hidden" ]]; then if [[ "${WLAN_SSID}" == "Hidden" ]]; then
DIALOG --inputbox "Enter the hidden SSID:" 8 65 \ DIALOG --inputbox "Enter the hidden SSID:" 8 65 \
"secret" 2>"${ANSWER}" || return 1 "secret" 2>"${ANSWER}" || return 1
WLAN_SSID=$(cat "${ANSWER}") WLAN_SSID=$(cat "${ANSWER}")
@ -84,11 +84,11 @@ do_wireless() {
donetwork() { donetwork() {
S_NET=0 S_NET=0
NETPARAMETERS="" NETPARAMETERS=""
while [[ "${NETPARAMETERS}" = "" ]]; do while [[ "${NETPARAMETERS}" == "" ]]; do
# select network interface # select network interface
INTERFACE= INTERFACE=
ifaces=$(net_interfaces) ifaces=$(net_interfaces)
while [[ "${INTERFACE}" = "" ]]; do while [[ "${INTERFACE}" == "" ]]; do
#shellcheck disable=SC2086 #shellcheck disable=SC2086
DIALOG --ok-label "Select" --menu "Select a network interface:" 14 55 7 ${ifaces} 2>"${ANSWER}" DIALOG --ok-label "Select" --menu "Select a network interface:" 14 55 7 ${ifaces} 2>"${ANSWER}"
case $? in case $? in
@ -128,7 +128,7 @@ donetwork() {
DIALOG --inputbox "Enter your proxy server, for example:\nhttp://name:port\nhttp://ip:port\nhttp://username:password@ip:port\n\n Leave the field empty if no proxy is needed to install." 13 65 "" 2>"${ANSWER}" || return 1 DIALOG --inputbox "Enter your proxy server, for example:\nhttp://name:port\nhttp://ip:port\nhttp://username:password@ip:port\n\n Leave the field empty if no proxy is needed to install." 13 65 "" 2>"${ANSWER}" || return 1
PROXY=$(cat "${ANSWER}") PROXY=$(cat "${ANSWER}")
PROXIES="http_proxy https_proxy ftp_proxy rsync_proxy HTTP_PROXY HTTPS_PROXY FTP_PROXY RSYNC_PROXY" PROXIES="http_proxy https_proxy ftp_proxy rsync_proxy HTTP_PROXY HTTPS_PROXY FTP_PROXY RSYNC_PROXY"
if [[ "${PROXY}" = "" ]]; then if [[ "${PROXY}" == "" ]]; then
for i in ${PROXIES}; do for i in ${PROXIES}; do
unset "${i}" unset "${i}"
done done
@ -151,11 +151,11 @@ donetwork() {
echo "" >> "${NETWORK_PROFILE}" echo "" >> "${NETWORK_PROFILE}"
echo "[Network]" >> "${NETWORK_PROFILE}" echo "[Network]" >> "${NETWORK_PROFILE}"
[[ "${IP}" == "dhcp" ]] && echo "DHCP=yes" >> "${NETWORK_PROFILE}" [[ "${IP}" == "dhcp" ]] && echo "DHCP=yes" >> "${NETWORK_PROFILE}"
if [[ "${CONNECTION}" = "wireless" ]]; then if [[ "${CONNECTION}" == "wireless" ]]; then
#shellcheck disable=SC2129 #shellcheck disable=SC2129
echo "IgnoreCarrierLoss=3s" >>"${NETWORK_PROFILE}" echo "IgnoreCarrierLoss=3s" >>"${NETWORK_PROFILE}"
fi fi
if [[ "${IP}" = "static" ]]; then if [[ "${IP}" == "static" ]]; then
#shellcheck disable=SC2129 #shellcheck disable=SC2129
echo "Address=${IPADDR}" >>"${NETWORK_PROFILE}" echo "Address=${IPADDR}" >>"${NETWORK_PROFILE}"
echo "Gateway=${GW}" >>"${NETWORK_PROFILE}" echo "Gateway=${GW}" >>"${NETWORK_PROFILE}"

10
usr/lib/archboot/installer/storage.sh
View file

@ -4,7 +4,7 @@
create_special() { create_special() {
NEXTITEM="" NEXTITEM=""
SPECIALDONE=0 SPECIALDONE=0
while [[ "${SPECIALDONE}" = "0" ]]; do while [[ "${SPECIALDONE}" == "0" ]]; do
if [[ -n "${NEXTITEM}" ]]; then if [[ -n "${NEXTITEM}" ]]; then
DEFAULT="--default-item ${NEXTITEM}" DEFAULT="--default-item ${NEXTITEM}"
else else
@ -29,7 +29,7 @@ create_special() {
SPECIALDONE=1 ;; SPECIALDONE=1 ;;
esac esac
done done
if [[ "${CANCEL}" = "1" ]]; then if [[ "${CANCEL}" == "1" ]]; then
NEXTITEM="3" NEXTITEM="3"
else else
NEXTITEM="4" NEXTITEM="4"
@ -40,7 +40,7 @@ create_special() {
_createmd() { _createmd() {
NEXTITEM="" NEXTITEM=""
MDDONE=0 MDDONE=0
while [[ "${MDDONE}" = "0" ]]; do while [[ "${MDDONE}" == "0" ]]; do
if [[ -n "${NEXTITEM}" ]]; then if [[ -n "${NEXTITEM}" ]]; then
DEFAULT="--default-item ${NEXTITEM}" DEFAULT="--default-item ${NEXTITEM}"
else else
@ -77,7 +77,7 @@ _createmd() {
_createlvm() { _createlvm() {
NEXTITEM="" NEXTITEM=""
LVMDONE=0 LVMDONE=0
while [[ "${LVMDONE}" = "0" ]]; do while [[ "${LVMDONE}" == "0" ]]; do
if [[ -n "${NEXTITEM}" ]]; then if [[ -n "${NEXTITEM}" ]]; then
DEFAULT="--default-item ${NEXTITEM}" DEFAULT="--default-item ${NEXTITEM}"
else else
@ -115,7 +115,7 @@ _createlvm() {
_createluks() { _createluks() {
NEXTITEM="" NEXTITEM=""
LUKSDONE=0 LUKSDONE=0
while [[ "${LUKSDONE}" = "0" ]]; do while [[ "${LUKSDONE}" == "0" ]]; do
if [[ -n "${NEXTITEM}" ]]; then if [[ -n "${NEXTITEM}" ]]; then
DEFAULT="--default-item ${NEXTITEM}" DEFAULT="--default-item ${NEXTITEM}"
else else