summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--TODO2
-rw-r--r--src/core/libs/lib-misc.sh8
-rw-r--r--src/core/libs/lib-software.sh9
3 files changed, 8 insertions, 11 deletions
diff --git a/TODO b/TODO
index e8ca3f1..97c0bae 100644
--- a/TODO
+++ b/TODO
@@ -6,8 +6,6 @@ CURRENT ISSUES:
* grub sedding sometimes does, and sometimes doesn't work. default config remains (eg /dev/hda3)
* when invoking /arch/aif -p interactive on a "normal" pc, it always wants to abort
* check everywhere that if users cancels something, we return 1, empty string behavior etc
-* core/interactive: fix workaround needed for installpkg exitcode
-* core/interactive: near end of pkg installation (after kernel) an error shows briefly: "aif: read..." this is probably related to the thing above.
* dm_crypt unlock at boot is in qwerty.
* after unlocking dm_crypt, FS check fails (reiserfs, must try other)
* find a way to make _cli_ask_checklist still userfriendly for long lists.. maybe we should just propose/ask to use dia if the list is too long
diff --git a/src/core/libs/lib-misc.sh b/src/core/libs/lib-misc.sh
index d0ad3f0..ef7a000 100644
--- a/src/core/libs/lib-misc.sh
+++ b/src/core/libs/lib-misc.sh
@@ -3,7 +3,7 @@
# run a process in the background, and log it's stdout and stderr to a specific logfile
# returncode is stored in $<identifier>_exitcode
-# $1 identifier
+# $1 identifier -> WARNING: do never ever use -'s or other fancy characters here. only numbers, letters and _ please. (because $<identifier>_exitcode must be a valid bash variable!)
# $2 command (will be eval'ed)
# $3 logfile
run_background ()
@@ -20,8 +20,8 @@ run_background ()
echo "STARTING $1 . Executing $2 >>$3 2>&1\n" >> $3;
var_exit=${1}_exitcode
eval "$2" >>$3 2>&1
- read $var_exit <<< $? #TODO: bash complains about 'not a valid identifier'
- debug 'MISC' "run_background done with $1: exitcode (\$$1_exitcode): ${!var_exit} .Logfile $3" #TODO ${!var_exit} doesn't show anything --> maybe fixed now
+ read $var_exit <<< $?
+ debug 'MISC' "run_background done with $1: exitcode (\$$1_exitcode): ${!var_exit} .Logfile $3"
echo >> $3
rm -f $RUNTIME_DIR/aif-$1-running
) &
@@ -31,7 +31,7 @@ run_background ()
# wait until a process is done
-# $1 identifier
+# $1 identifier. WARNING! see above
wait_for ()
{
[ -z "$1" ] && die_error "wait_for needs an identifier to known on which command to wait!"
diff --git a/src/core/libs/lib-software.sh b/src/core/libs/lib-software.sh
index 607d046..27bd6fd 100644
--- a/src/core/libs/lib-software.sh
+++ b/src/core/libs/lib-software.sh
@@ -26,14 +26,14 @@ run_mkinitcpio()
installpkg() {
notify "Package installation will begin now. You can watch the output in the progress window. Please be patient."
target_special_fs on
- run_background pacman-installpkg "$PACMAN_TARGET --noconfirm -S $TARGET_PACKAGES" $TMP_PACMAN_LOG #TODO: There may be something wrong here. See http://projects.archlinux.org/?p=installer.git;a=commitdiff;h=f504e9ecfb9ecf1952bd8dcce7efe941e74db946 ASKDEV (Simo)
+ run_background pacman_installpkg "$PACMAN_TARGET --noconfirm -S $TARGET_PACKAGES" $TMP_PACMAN_LOG #TODO: There may be something wrong here. See http://projects.archlinux.org/?p=installer.git;a=commitdiff;h=f504e9ecfb9ecf1952bd8dcce7efe941e74db946 ASKDEV (Simo)
follow_progress " Installing... Please Wait " $TMP_PACMAN_LOG
- wait_for pacman-installpkg
+ wait_for pacman_installpkg
local _result=''
- if [ ${pacman-installpkg_exitcode} -ne 0 ]; then
+ if [ ${pacman_installpkg_exitcode} -ne 0 ]; then
_result="Installation Failed (see errors below)"
echo -e "\nPackage Installation FAILED." >>$TMP_PACMAN_LOG
else
@@ -46,8 +46,7 @@ installpkg() {
target_special_fs off
sync
- #return ${pacman-installpkg_exitcode} TODO: fix this. there is something wrong here
- return 0
+ return ${pacman_installpkg_exitcode}
}