diff options
| author | Dieter Plaetinck <dieter@plaetinck.be> | 2009-02-28 18:43:37 +0100 |
|---|---|---|
| committer | Dieter Plaetinck <dieter@plaetinck.be> | 2009-02-28 18:43:37 +0100 |
| commit | debbad71e110d7a39a1115ca4d954173137b959b (patch) | |
| tree | 64b5940d5522ad6304481c56fe60541ae40b7437 /src/core/libs/lib-software.sh | |
| parent | 031b0a3936898a64976ba06fb2c8bb242fac046e (diff) | |
fix for bash read: not a valid identifier, and hence, got rid of the pacman install pkg workaround (finally!!)
Diffstat (limited to 'src/core/libs/lib-software.sh')
| -rw-r--r-- | src/core/libs/lib-software.sh | 9 |
1 files changed, 4 insertions, 5 deletions
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} } |