diff options
| -rwxr-xr-x | spm | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -71,12 +71,12 @@ spm_install() { fi # if upgrade but not already installed, exit - if [ "$upgrade" ] && [ ! -f $PKGDB/$name ]; then + if [ "$upgrade" ] && [ ! -s $PKGDB/$name ]; then msgerr "Package '$name' not installed, use '-i' to install." fi # if already installed and not an upgrade, exit - if [ -f $PKGDB/$name ] && [ ! "$upgrade" ]; then + if [ -s $PKGDB/$name ] && [ ! "$upgrade" ]; then msgerr "Package '$name' is installed, use '-u' to reinstall/upgrade." fi @@ -97,7 +97,7 @@ spm_install() { msg "Verify package..." tar -tvf "$1" > $SPMDIR/files.list 2>/dev/null || { msg "Package '$1' is corrupted. Aborted." - rm -f $SPMDIR/files.list + rm -f "$SPMDIR/files.list" "$SPMDIR/install.lock" exit 1 } @@ -133,7 +133,7 @@ spm_install() { echo "${p:-(none)}: $line" done msg "File conflict found. Enable 'SPM_FORCEINSTALL' env to force install." - rm -f "$SPMDIR/conflict.list" "$SPMDIR/lock" + rm -f "$SPMDIR/conflict.list" "$SPMDIR/install.lock" exit 1 fi @@ -160,7 +160,7 @@ spm_install() { *) rm "${SPM_ROOT%/}"/"$line";; esac done - rm -f $SPMDIR/old.list + rm -f "$SPMDIR/old.list" cd - >/dev/null fi @@ -168,16 +168,16 @@ spm_install() { mkdir -p $PKGDB echo "$version-$release" > $PKGDB/$name cat $SPMDIR/install.list >> $PKGDB/$name - rm -f $SPMDIR/install.list + rm -f "$SPMDIR/install.list" # permission mkdir -p $PERMDIR $OWNDIR - rm -f $PERMDIR/$name $OWNDIR/$name + rm -f "$PERMDIR/$name" "$OWNDIR/$name" grep ^d $SPMDIR/files.list | awk '{print $1,$2,$6}' | while read -r perms owner dir; do [ "$perms" = "drwxr-xr-x" ] || echo "$(cvperms $perms) $dir" >> $PERMDIR/$name [ "$owner" = "root/root" ] || echo "$owner $dir" | sed 's,/,:,' >> $OWNDIR/$name done - rm -f $SPMDIR/files.list + rm -f "$SPMDIR/files.list" # correct dir permission [ "$(ls -1 $PERMDIR)" ] && { |