Remove (unused) +[PackageCell heightForPackage:].

[cydia.git] / Library / move.sh

diff --git a/Library/move.sh b/Library/move.sh
index 31c89e4c6e6ac91b136b9aae88696caf0d193f46..4a15ca711039e23e032041c2067cee251bf24023 100755 (executable)
--- a/Library/move.sh
+++ b/Library/move.sh
@@ -2,6 +2,13 @@
 
 shopt -s extglob nullglob
 
+if [[ ${1:0:1} == - ]]; then
+    v=$1
+    shift 1
+else
+    v=
+fi
+
 function df_() {
     free=$(df -B1 "$1")
     free=${free% *%*}
@@ -12,24 +19,20 @@ function df_() {
 
 function mv_() {
     src=$1
-    dst=$2
 
-    if [[ -e ${dst} ]]; then
-        dst=$(mktemp -d /var/cydia.XXXXXX)
-    else
-        mkdir -p "${dst}"
-    fi
+    mkdir -p /var/stash
+    dst=$(mktemp -d /var/stash/"${src##*/}".XXXXXX)
 
     if [[ -e ${src} ]]; then
         chmod --reference="${src}" "${dst}"
         chown --reference="${src}" "${dst}"
 
-        cp -aT "${src}" "${dst}" || {
+        cp -aT $v "${src}" "${dst}" || {
             rm -rf "${dst}"
             exit 1
         }
 
-        rm -rf "${src}"
+        rm -rf $v "${src}"
     else
         chmod 775 "${dst}"
         chown root.admin "${dst}"
@@ -39,20 +42,19 @@ function mv_() {
 }
 
 function shift_() {
-    dir=$1
-    dst=$2
+    dir=${1%/}
 
     if [[ -d ${dir} && ! -h ${dir} ]]; then
-        used=$(du -bs "${dir}")
+        used=$(/usr/libexec/cydia/du -bs "${dir}")
         used=${used%%$'\t'*}
         free=$(df_ /var)
 
         if [[ $((used + 524288)) -lt ${free} ]]; then
-            mv_ "${dir}" "${dst}"
+            mv_ "${dir}"
         fi
-    elif [[ -h ${dir} && ! -e ${dir} ]]; then
+    elif [[ ! -e ${dir} ]]; then
         rm -f "${dir}"
-        mv_ "${dir}" "${dst}"
+        mv_ "${dir}"
     fi
 }