From fb96730dbfd801c45bc2009c1960d30403ecabc1 Mon Sep 17 00:00:00 2001 From: Dieter Plaetinck Date: Sun, 22 Feb 2009 17:48:13 +0100 Subject: since we use /tmp now, no more need to hide files. some categorizing (tagging) of files is useful though --- src/core/libs/lib-blockdevices-filesystems.sh | 10 +++++----- src/core/libs/lib-misc.sh | 8 ++++---- src/core/libs/lib-ui.sh | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) (limited to 'src/core/libs') diff --git a/src/core/libs/lib-blockdevices-filesystems.sh b/src/core/libs/lib-blockdevices-filesystems.sh index 3b43541..1cbfcbe 100644 --- a/src/core/libs/lib-blockdevices-filesystems.sh +++ b/src/core/libs/lib-blockdevices-filesystems.sh @@ -25,11 +25,11 @@ modprobe aes-i586 || show_warning modprobe 'Could not modprobe aes-i586. no supp -TMP_DEV_MAP=$RUNTIME_DIR/dev.map -TMP_FSTAB=$RUNTIME_DIR/.fstab -TMP_PARTITIONS=$RUNTIME_DIR/.partitions -TMP_FILESYSTEMS=$RUNTIME_DIR/.filesystems # Only used internally by this library. Do not even think about using this as interface to this library. it won't work -TMP_BLOCKDEVICES=$RUNTIME_DIR/.blockdata +TMP_DEV_MAP=$RUNTIME_DIR/aif-dev.map +TMP_FSTAB=$RUNTIME_DIR/aif-fstab +TMP_PARTITIONS=$RUNTIME_DIR/aif-partitions +TMP_FILESYSTEMS=$RUNTIME_DIR/aif-filesystems # Only used internally by this library. Do not even think about using this as interface to this library. it won't work +TMP_BLOCKDEVICES=$RUNTIME_DIR/aif-blockdata diff --git a/src/core/libs/lib-misc.sh b/src/core/libs/lib-misc.sh index 01c291f..c7a5d2f 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 $RUNTIME_DIR/.$1-running + touch $RUNTIME_DIR/aif-$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' 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 $RUNTIME_DIR/.$1-running + rm -f $RUNTIME_DIR/aif-$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 $RUNTIME_DIR/.$1-running ] + while [ -f $RUNTIME_DIR/aif-$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 @@ -66,5 +66,5 @@ check_is_in () cleanup_runtime () { mkdir -p $RUNTIME_DIR || die_error "Cannot create $RUNTIME_DIR" - rm -rf $RUNTIME_DIR/.dia* &>/dev/null + rm -rf $RUNTIME_DIR/aif-dia* &>/dev/null } diff --git a/src/core/libs/lib-ui.sh b/src/core/libs/lib-ui.sh index 2315394..0664817 100644 --- a/src/core/libs/lib-ui.sh +++ b/src/core/libs/lib-ui.sh @@ -6,9 +6,9 @@ # Taken from setup. we store dialog output in a file. TODO: can't we do this with variables? ASKDEV -ANSWER=$RUNTIME_DIR/.dialog-answer +ANSWER=$RUNTIME_DIR/aif-dialog-answer DIA_MENU_TEXT="Use the UP and DOWN arrows to navigate menus. Use TAB to switch between buttons and ENTER to select." -DIA_SUCCESSIVE_ITEMS=$RUNTIME_DIR/.dia-successive-items +DIA_SUCCESSIVE_ITEMS=$RUNTIME_DIR/aif-dia-successive-items ### Functions that your code can use. Cli/dialog mode is fully transparant. This library takes care of it ### -- cgit v1.2.3-54-g00ecf