updated HOWTO for install using packages, got rid of patch-install-cd script + renamed fifa into aif everywhere

5 files changed, 15 insertions, 15 deletions

diff --git a/src/core/libs/lib-blockdevices-filesystems.sh b/src/core/libs/lib-blockdevices-filesystems.sh
index 7c3e17d..ef3bb36 100644
--- a/src/core/libs/lib-blockdevices-filesystems.sh
+++ b/src/core/libs/lib-blockdevices-filesystems.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-TMP_DEV_MAP=/home/arch/fifa/runtime/dev.map
-TMP_FSTAB=/home/arch/fifa/runtime/.fstab
+TMP_DEV_MAP=/home/arch/aif/runtime/dev.map
+TMP_FSTAB=/home/arch/aif/runtime/.fstab
 
 # procedural code from quickinst functionized and fixed.
 # there were functions like this in the setup script too, with some subtle differences.  see below
diff --git a/src/core/libs/lib-misc.sh b/src/core/libs/lib-misc.sh
index b85e151..f4ae997 100644
--- a/src/core/libs/lib-misc.sh
+++ b/src/core/libs/lib-misc.sh
@@ -14,7 +14,7 @@ run_background ()
 
 	debug "run_background called. identifier: $1, command: $2, logfile: $3"
 	( \
-		touch /home/arch/fifa/runtime/$1-running
+		touch /home/arch/aif/runtime/$1-running
 		debug "run_background starting $1: $2 >>$3 2>&1"
 		[ -f $3 ] && echo -e "\n\n\n" >>$3
 		echo "STARTING $1 . Executing $2 >>$3 2>&1\n" >> $3;
@@ -23,7 +23,7 @@ run_background ()
 		read $var_exit <<< $? #TODO: bash complains about 'not a valid identifier' or something iirc -> maybe fixed now..
 		debug "run_background done with $1: exitcode (\$$1_exitcode): "${!var_exit}" .Logfile $3" #TODO ${!var_exit} doesn't show anything --> maybe fixed now
 		echo >> $3   
-		rm -f /home/arch/fifa/runtime/$1-running
+		rm -f /home/arch/aif/runtime/$1-running
 	) &
 
 	sleep 2
@@ -36,7 +36,7 @@ wait_for ()
 {
 	[ -z "$1" ] && die_error "wait_for needs an identifier to known on which command to wait!"
 
-	while [ -f /home/arch/fifa/runtime/$1-running ]
+	while [ -f /home/arch/aif/runtime/$1-running ]
 	do
 		#TODO: follow_progress dialog mode = nonblocking (so check and sleep is good), cli mode (tail -f )= blocking? (so check is probably not needed as it will be done)
 		sleep 1
diff --git a/src/core/libs/lib-software.sh b/src/core/libs/lib-software.sh
index b9f0fb7..1785e85 100644
--- a/src/core/libs/lib-software.sh
+++ b/src/core/libs/lib-software.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-TMP_MKINITCPIO_LOG=/home/arch/fifa/runtime/mkinitcpio.log
-TMP_PACMAN_LOG=/home/arch/fifa/runtime/pacman.log
+TMP_MKINITCPIO_LOG=/home/arch/aif/runtime/mkinitcpio.log
+TMP_PACMAN_LOG=/home/arch/aif/runtime/pacman.log
 
 # run_mkinitcpio() taken from setup. adapted a lot
 # runs mkinitcpio on the target system, displays output
diff --git a/src/core/libs/lib-ui-interactive.sh b/src/core/libs/lib-ui-interactive.sh
index b42b5b5..e0c536c 100644
--- a/src/core/libs/lib-ui-interactive.sh
+++ b/src/core/libs/lib-ui-interactive.sh
@@ -227,7 +227,7 @@ interactive_autoprepare()
 interactive_mountpoints() {
     while [ "$PARTFINISH" != "DONE" ]; do
         : >$TMP_FSTAB
-        : >/home/arch/fifa/runtime/.parts #TODO: use a variable instead of a file, we don't need to use a file for this
+        : >/home/arch/aif/runtime/.parts #TODO: use a variable instead of a file, we don't need to use a file for this
 
         # Determine which filesystems are available
         FSOPTS="ext2 ext2 ext3 ext3"
@@ -245,7 +245,7 @@ interactive_mountpoints() {
         if [ "$PART" != "NONE" ]; then
             DOMKFS="no"
             ask_yesno "Would you like to create a filesystem on $PART?\n\n(This will overwrite existing data!)" && DOMKFS="yes"
-            echo "$PART:swap:swap:$DOMKFS" >>/home/arch/fifa/runtime/.parts
+            echo "$PART:swap:swap:$DOMKFS" >>/home/arch/aif/runtime/.parts
         fi
 
         _dia_DIALOG --menu "Select the partition to mount as /" 21 50 13 $PARTS 2>$ANSWER || return 1
@@ -257,7 +257,7 @@ interactive_mountpoints() {
         FSTYPE=$(cat $ANSWER)
         DOMKFS="no"
         ask_yesno "Would you like to create a filesystem on $PART?\n\n(This will overwrite existing data!)" && DOMKFS="yes"
-        echo "$PART:$FSTYPE:/:$DOMKFS" >>/home/arch/fifa/runtime/.parts
+        echo "$PART:$FSTYPE:/:$DOMKFS" >>/home/arch/aif/runtime/.parts
 
         #
         # Additional partitions
@@ -273,23 +273,23 @@ interactive_mountpoints() {
             while [ "${MP}" = "" ]; do
                 _dia_DIALOG --inputbox "Enter the mountpoint for $PART" 8 65 "/boot" 2>$ANSWER || return 1
                 MP=$(cat $ANSWER)
-                if grep ":$MP:" /home/arch/fifa/runtime/.parts; then
+                if grep ":$MP:" /home/arch/aif/runtime/.parts; then
                     notify "ERROR: You have defined 2 identical mountpoints! Please select another mountpoint."
                     MP=""
                 fi
             done
             DOMKFS="no"
             ask_yesno "Would you like to create a filesystem on $PART?\n\n(This will overwrite existing data!)" && DOMKFS="yes"
-            echo "$PART:$FSTYPE:$MP:$DOMKFS" >>/home/arch/fifa/runtime/.parts
+            echo "$PART:$FSTYPE:$MP:$DOMKFS" >>/home/arch/aif/runtime/.parts
             _dia_DIALOG --menu "Select any additional partitions to mount under your new root" 21 50 13 $PARTS DONE _ 2>$ANSWER || return 1
             PART=$(cat $ANSWER)
         done
-        ask_yesno "Would you like to create and mount the filesytems like this?\n\nSyntax\n------\nDEVICE:TYPE:MOUNTPOINT:FORMAT\n\n$(for i in $(cat /home/arch/fifa/runtime/.parts); do echo "$i\n";done)"  && PARTFINISH="DONE"
+        ask_yesno "Would you like to create and mount the filesytems like this?\n\nSyntax\n------\nDEVICE:TYPE:MOUNTPOINT:FORMAT\n\n$(for i in $(cat /home/arch/aif/runtime/.parts); do echo "$i\n";done)"  && PARTFINISH="DONE"
     done
 
     target_umountall
 
-	fix_filesystems /home/arch/fifa/runtime/.parts && notify "Partitions were successfully mounted." && return 0
+	fix_filesystems /home/arch/aif/runtime/.parts && notify "Partitions were successfully mounted." && return 0
 
 	show_warning "Failure while doing filesystems" "Something went wrong.  Check your logs"
 	return 1
diff --git a/src/core/libs/lib-ui.sh b/src/core/libs/lib-ui.sh
index 40b5046..d8f3f8f 100644
--- a/src/core/libs/lib-ui.sh
+++ b/src/core/libs/lib-ui.sh
@@ -3,7 +3,7 @@
 
 
 # Taken from setup.  we store dialog output in a file.  TODO: can't we do this with variables?
-ANSWER="/home/arch/fifa/runtime/.dialog-answer"
+ANSWER="/home/arch/aif/runtime/.dialog-answer"
 DIA_MENU_TEXT="Use the UP and DOWN arrows to navigate menus.  Use TAB to switch between buttons and ENTER to select."