apply indentation with tabs everywhere

2 files changed, 89 insertions, 89 deletions

diff --git a/src/core/libs/lib-network.sh b/src/core/libs/lib-network.sh
index 41eb27f..03d5361 100644
--- a/src/core/libs/lib-network.sh
+++ b/src/core/libs/lib-network.sh
@@ -10,53 +10,53 @@ target_configure_network()
 	# so check if the settings file was created to be sure
 	if [ -f $RUNTIME_DIR/aif-network-settings ]; then
 
-        debug NETWORK "Configuring network settings on target system according to installer settings"
-
-        source $RUNTIME_DIR/aif-network-settings 2>/dev/null || return 1
-
-        IFO=${INTERFACE_PREV:-eth0} # old iface: a previously entered one, or the arch default
-        IFN=${INTERFACE:-eth0} # new iface: a specified one, or the arch default
-
-        # comment out any existing uncommented entries, whether specified by us, or arch defaults.
-        for var in eth0 $IFO INTERFACES gateway ROUTES
-        do
-            sed -i "s/^$var=/#$var=/" ${var_TARGET_DIR}/etc/rc.conf || return 1
-        done
-        sed -i "s/^nameserver/#nameserver/" ${var_TARGET_DIR}/etc/resolv.conf || return 1
-        if [ -f ${var_TARGET_DIR}/etc/profile.d/proxy.sh ]
-        then
-            sed -i "s/^export/#export/" ${var_TARGET_DIR}/etc/profile.d/proxy.sh || return 1
-        fi
-
-        if [ "$DHCP" = 0 ] ; then
-            local line="$IFN=\"$IFN ${IPADDR:-192.168.0.2} netmask ${SUBNET:-255.255.255.0} broadcast ${BROADCAST:-192.168.0.255}\""
-            append_after_last "/$IFO\|eth0/" "$line" ${var_TARGET_DIR}/etc/rc.conf || return 1
-
-            if [ -n "$GW" ]; then
-                append_after_last "/gateway/" "gateway=\"default gw $GW\"" ${var_TARGET_DIR}/etc/rc.conf || return 1
-                append_after_last "/ROUTES/" "ROUTES=(gateway)" ${var_TARGET_DIR}/etc/rc.conf || return 1
-            fi
-            if [ -n "$DNS" ]
-            then
-                echo "nameserver $DNS" >> ${var_TARGET_DIR}/etc/resolv.conf || return 1
-            fi
-        else
-            append_after_last "/$IFO\|eth0/" "$IFN=\"dhcp\"" ${var_TARGET_DIR}/etc/rc.conf || return 1
-        fi
-
-        append_after_last "/$IFO\|eth0/" "INTERFACES=($IFN)" ${var_TARGET_DIR}/etc/rc.conf || return 1
-
-        if [ -n "$PROXY_HTTP" ]; then
-            echo "export http_proxy=$PROXY_HTTP" >> ${var_TARGET_DIR}/etc/profile.d/proxy.sh || return 1
-            chmod a+x ${var_TARGET_DIR}/etc/profile.d/proxy.sh || return 1
-        fi
-
-        if [ -n "$PROXY_FTP" ]; then
-            echo "export ftp_proxy=$PROXY_FTP" >> ${var_TARGET_DIR}/etc/profile.d/proxy.sh || return 1
-            chmod a+x ${var_TARGET_DIR}/etc/profile.d/proxy.sh || return 1
-        fi
-    else
-        debug NETWORK "Skipping Host Network Configuration - aif-network-settings not found"
-    fi
-    return 0
+		debug NETWORK "Configuring network settings on target system according to installer settings"
+
+		source $RUNTIME_DIR/aif-network-settings 2>/dev/null || return 1
+
+		IFO=${INTERFACE_PREV:-eth0} # old iface: a previously entered one, or the arch default
+		IFN=${INTERFACE:-eth0} # new iface: a specified one, or the arch default
+
+		# comment out any existing uncommented entries, whether specified by us, or arch defaults.
+		for var in eth0 $IFO INTERFACES gateway ROUTES
+		do
+			sed -i "s/^$var=/#$var=/" ${var_TARGET_DIR}/etc/rc.conf || return 1
+		done
+		sed -i "s/^nameserver/#nameserver/" ${var_TARGET_DIR}/etc/resolv.conf || return 1
+		if [ -f ${var_TARGET_DIR}/etc/profile.d/proxy.sh ]
+		then
+			sed -i "s/^export/#export/" ${var_TARGET_DIR}/etc/profile.d/proxy.sh || return 1
+		fi
+
+		if [ "$DHCP" = 0 ] ; then
+			local line="$IFN=\"$IFN ${IPADDR:-192.168.0.2} netmask ${SUBNET:-255.255.255.0} broadcast ${BROADCAST:-192.168.0.255}\""
+			append_after_last "/$IFO\|eth0/" "$line" ${var_TARGET_DIR}/etc/rc.conf || return 1
+
+			if [ -n "$GW" ]; then
+				append_after_last "/gateway/" "gateway=\"default gw $GW\"" ${var_TARGET_DIR}/etc/rc.conf || return 1
+				append_after_last "/ROUTES/" "ROUTES=(gateway)" ${var_TARGET_DIR}/etc/rc.conf || return 1
+			fi
+			if [ -n "$DNS" ]
+			then
+				echo "nameserver $DNS" >> ${var_TARGET_DIR}/etc/resolv.conf || return 1
+			fi
+		else
+			append_after_last "/$IFO\|eth0/" "$IFN=\"dhcp\"" ${var_TARGET_DIR}/etc/rc.conf || return 1
+		fi
+
+		append_after_last "/$IFO\|eth0/" "INTERFACES=($IFN)" ${var_TARGET_DIR}/etc/rc.conf || return 1
+
+		if [ -n "$PROXY_HTTP" ]; then
+			echo "export http_proxy=$PROXY_HTTP" >> ${var_TARGET_DIR}/etc/profile.d/proxy.sh || return 1
+			chmod a+x ${var_TARGET_DIR}/etc/profile.d/proxy.sh || return 1
+		fi
+
+		if [ -n "$PROXY_FTP" ]; then
+			echo "export ftp_proxy=$PROXY_FTP" >> ${var_TARGET_DIR}/etc/profile.d/proxy.sh || return 1
+			chmod a+x ${var_TARGET_DIR}/etc/profile.d/proxy.sh || return 1
+		fi
+	else
+		debug NETWORK "Skipping Host Network Configuration - aif-network-settings not found"
+	fi
+	return 0
 }
diff --git a/src/core/libs/lib-software.sh b/src/core/libs/lib-software.sh
index aecbb39..bb84621 100644
--- a/src/core/libs/lib-software.sh
+++ b/src/core/libs/lib-software.sh
@@ -66,10 +66,10 @@ installpkg() {
 # enable glibc locales from rc.conf and build initial locale DB
 target_configure_initial_locale() 
 {
-    for i in $(grep "^LOCALE" ${var_TARGET_DIR}/etc/rc.conf | sed -e 's/.*="//g' -e's/\..*//g'); do
-        sed -i -e "s/^#$i/$i/g" ${var_TARGET_DIR}/etc/locale.gen
-    done
-    target_locale-gen
+	for i in $(grep "^LOCALE" ${var_TARGET_DIR}/etc/rc.conf | sed -e 's/.*="//g' -e's/\..*//g'); do
+		sed -i -e "s/^#$i/$i/g" ${var_TARGET_DIR}/etc/locale.gen
+	done
+	target_locale-gen
 }
 
 
@@ -81,41 +81,41 @@ target_locale-gen ()
 
 target_configure_initcpio () {
 	local ret=0
-        # Give initcpio the encrypt hook when / depends on an encrypted volume
-        # (other encrypted volumes, not related to / don't need the encrypt hook, afaik)
-        # If / also depends on lvm, this way the lvm2 hook will also be included in the right place
-        if get_anchestors_mount ';/;'
-        then
-                hooks=`echo "$ANSWER_DEVICES" | cut -d ' ' -f2 | egrep 'lvm-lv|dm_crypt' | sed -e 's/lvm-lv/lvm2/' -e 's/dm_crypt/encrypt/' | tac`
-                hooks=`echo $hooks` # $hooks is now a space separated, correctly ordered list of needed hooks
-                if [ -n "$hooks" ]
-                then
-                        # for each hook we're about to add, remove it first if it's already in
-                        for hook in $hooks
-                        do
-                                sed -i "/^HOOKS/ s/$hook //" ${var_TARGET_DIR}/etc/mkinitcpio.conf || ret=$?
-                        done
-                        # now add the correctly ordered string
-                        sed -i "/^HOOKS/ s/filesystems/$hooks filesystems/" ${var_TARGET_DIR}/etc/mkinitcpio.conf || ret=$?
-                fi
-        fi
-        # The lvm2 hook however is needed for any lvm LV, no matter the involved mountpoints, so include it if we still need to
-        if grep -q lvm-lv $TMP_BLOCKDEVICES && ! grep -q '^HOOKS.*lvm2'  ${var_TARGET_DIR}/etc/mkinitcpio.conf
-        then
-                sed -i "/^HOOKS/ s/filesystems/lvm2 filesystems/" ${var_TARGET_DIR}/etc/mkinitcpio.conf || ret=$?
-        fi
-
-        # if keymap/usbinput are not in mkinitcpio.conf, but encrypt is, we should probably add it
-        if line=`grep '^HOOKS.*encrypt' ${var_TARGET_DIR}/etc/mkinitcpio.conf`
-        then
-                if ! echo "$line" | grep -q keymap
-                then
-                        sed -i '/^HOOKS/ s/encrypt/keymap encrypt/' ${var_TARGET_DIR}/etc/mkinitcpio.conf || ret=$?
-                fi
-                if ! echo "$line" | grep -q usbinput
-                then
-                        sed -i '/^HOOKS/ s/keymap/usbinput keymap/' ${var_TARGET_DIR}/etc/mkinitcpio.conf || ret=$?
-                fi
-        fi
+	# Give initcpio the encrypt hook when / depends on an encrypted volume
+	# (other encrypted volumes, not related to / don't need the encrypt hook, afaik)
+	# If / also depends on lvm, this way the lvm2 hook will also be included in the right place
+	if get_anchestors_mount ';/;'
+	then
+		hooks=`echo "$ANSWER_DEVICES" | cut -d ' ' -f2 | egrep 'lvm-lv|dm_crypt' | sed -e 's/lvm-lv/lvm2/' -e 's/dm_crypt/encrypt/' | tac`
+		hooks=`echo $hooks` # $hooks is now a space separated, correctly ordered list of needed hooks
+		if [ -n "$hooks" ]
+		then
+			# for each hook we're about to add, remove it first if it's already in
+			for hook in $hooks
+			do
+				sed -i "/^HOOKS/ s/$hook //" ${var_TARGET_DIR}/etc/mkinitcpio.conf || ret=$?
+			done
+			# now add the correctly ordered string
+			sed -i "/^HOOKS/ s/filesystems/$hooks filesystems/" ${var_TARGET_DIR}/etc/mkinitcpio.conf || ret=$?
+		fi
+	fi
+	# The lvm2 hook however is needed for any lvm LV, no matter the involved mountpoints, so include it if we still need to
+	if grep -q lvm-lv $TMP_BLOCKDEVICES && ! grep -q '^HOOKS.*lvm2'  ${var_TARGET_DIR}/etc/mkinitcpio.conf
+	then
+		sed -i "/^HOOKS/ s/filesystems/lvm2 filesystems/" ${var_TARGET_DIR}/etc/mkinitcpio.conf || ret=$?
+	fi
+
+	# if keymap/usbinput are not in mkinitcpio.conf, but encrypt is, we should probably add it
+	if line=`grep '^HOOKS.*encrypt' ${var_TARGET_DIR}/etc/mkinitcpio.conf`
+	then
+		if ! echo "$line" | grep -q keymap
+		then
+			sed -i '/^HOOKS/ s/encrypt/keymap encrypt/' ${var_TARGET_DIR}/etc/mkinitcpio.conf || ret=$?
+		fi
+		if ! echo "$line" | grep -q usbinput
+		then
+			sed -i '/^HOOKS/ s/keymap/usbinput keymap/' ${var_TARGET_DIR}/etc/mkinitcpio.conf || ret=$?
+		fi
+	fi
 	return $ret
 }