Finished space conversion

Signed-off-by: Dan Schaper <dan.schaper@pihole.net>

.editorconfig

@@ -9,7 +9,7 @@ end_of_line = lf
 insert_final_newline = true
 indent_style = space
 indent_size = tab
-tab_width = 2
+tab_width = 4
 charset = utf-8
 trim_trailing_whitespace = true
 

.idea/codeStyles/Project.xml

@@ -1,11 +1,5 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
-    <option name="OTHER_INDENT_OPTIONS">
-      <value>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
-      </value>
-    </option>
     <MarkdownNavigatorCodeStyleSettings>
       <option name="RIGHT_MARGIN" value="72" />
     </MarkdownNavigatorCodeStyleSettings>

automated install/basic-install.sh

@@ -291,7 +291,6 @@ elif command -v rpm &> /dev/null; then
                 "${PKG_INSTALL[@]}" "yum-utils" &> /dev/null
                 yum-config-manager --enable ${REMI_REPO} &> /dev/null
                 echo -e "  ${TICK} Remi's RPM repository has been enabled for PHP7"
-
             fi
         fi
     fi
@@ -302,7 +301,6 @@ elif command -v rpm &> /dev/null; then
         exit
     fi
 
-
 # If neither apt-get or rmp/dnf are found
 else
     # it's not an OS we can support,
@@ -458,7 +456,6 @@ find_IPv4_information() {
     IPV4_ADDRESS=$(ip -o -f inet addr show | grep "${IPv4bare}" |  awk '{print $4}' | awk 'END {print}')
     # Get the default gateway (the way to reach the Internet)
     IPv4gw=$(awk '{print $3}' <<< "${route}")
-
 }
 
 # Get available interfaces that are UP
@@ -483,7 +480,6 @@ In the next section, you can choose to use your current network settings (DHCP)
 
 # We need to make sure there is enough space before installing, so there is a function to check this
 verifyFreeDiskSpace() {
-
     # 50MB is the minimum space needed (45MB install (includes web admin bootstrap/jquery libraries etc) + 5MB one day of logs.)
     # - Fourdee: Local ensures the variable is only created, and accessible within this function/void. Generally considered a "good" coding practice for non-global variables.
     local str="Disk space check"
@@ -2182,8 +2178,7 @@ get_binary_name() {
     fi
 }
 
-FTLcheckUpdate()
+FTLcheckUpdate() {
-{
     get_binary_name
 
     #In the next section we check to see if FTL is already installed (in case of pihole -r).
@@ -2434,7 +2429,7 @@ main() {
             # generate a random password
             pw=$(tr -dc _A-Z-a-z-0-9 < /dev/urandom | head -c 8)
             # shellcheck disable=SC1091
-        . /opt/pihole/webpage.sh
+            /opt/pihole/webpage.sh
             echo "WEBPASSWORD=$(HashPassword ${pw})" >> ${setupVars}
         fi
     fi
@@ -2467,8 +2462,8 @@ main() {
     runGravity
 
     # Force an update of the updatechecker
-  . /opt/pihole/updatecheck.sh
+    /opt/pihole/updatecheck.sh
-  . /opt/pihole/updatecheck.sh x remote
+    /opt/pihole/updatecheck.sh x remote
 
     #
     if [[ "${useUpdateVars}" == false ]]; then