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

move PROXY setting before activating network

Browse source
This commit is contained in:
Tobias Powalowski 2022-12-05 13:05:00 +01:00
parent bcef55b986
commit f904fb32d7
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -107,7 +107,20 @@ donetwork() {
DIALOG --inputbox "Enter your DNS server IP:" 7 40 "192.168.1.1" 2>"${ANSWER}" || return 1
DNS=$(cat "${ANSWER}")
fi
DIALOG --yesno "Are these settings correct?\n\nInterface: ${INTERFACE}\nConnection: ${CONNECTION}\nESSID: ${WLAN_ESSID}\nHidden: ${WLAN_HIDDEN}\nEncryption: ${WLAN_SECURITY}\nKey: ${WLAN_KEY}\ndhcp or static: ${IP}\nIP address: ${IPADDR}\nGateway: ${GW}\nDNS server: ${DNS}" 0 0
# http/ftp proxy settings
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}")
PROXIES="http_proxy https_proxy ftp_proxy rsync_proxy HTTP_PROXY HTTPS_PROXY FTP_PROXY RSYNC_PROXY"
if [[ "${PROXY}" = "" ]]; then
for i in ${PROXIES}; do
unset "${i}"
done
else
for i in ${PROXIES}; do
export "${i}"="${PROXY}"
done
fi
DIALOG --yesno "Are these settings correct?\n\nInterface: ${INTERFACE}\nConnection: ${CONNECTION}\nESSID: ${WLAN_ESSID}\nHidden: ${WLAN_HIDDEN}\nEncryption: ${WLAN_SECURITY}\nKey: ${WLAN_KEY}\ndhcp or static: ${IP}\nIP address: ${IPADDR}\nGateway: ${GW}\nDNS server: ${DNS}\nProxy setting: ${PROXY}" 0 0
case $? in
1) ;;
0) NETPARAMETERS="1" ;;
@ -155,19 +168,6 @@ donetwork() {
DIALOG --infobox "Link is up. Continuing in 3 seconds ..." 3 60
sleep 3
fi
# http/ftp proxy settings
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}")
PROXIES="http_proxy https_proxy ftp_proxy rsync_proxy HTTP_PROXY HTTPS_PROXY FTP_PROXY RSYNC_PROXY"
if [[ "${PROXY}" = "" ]]; then
for i in ${PROXIES}; do
unset "${i}"
done
else
for i in ${PROXIES}; do
export "${i}"="${PROXY}"
done
fi
NEXTITEM="2"
S_NET=1
}