Do not crash if Safari's Info.plist can't be read.

[cydia.git] / Library / move.sh

diff --git a/Library/move.sh b/Library/move.sh
index 0b9e09d2748eca60202ceea473aee1e327cc90ce..1e9dbb22cf88ce8f9ca61fadf9a14b691b10644b 100755 (executable)
--- a/Library/move.sh
+++ b/Library/move.sh
@@ -2,6 +2,13 @@
 
 shopt -s extglob nullglob
 
 
 shopt -s extglob nullglob
 

+if [[ ${1:0:1} == - ]]; then
+    v=$1
+    shift 1
+else
+    v=
+fi
+

 function df_() {
     free=$(df -B1 "$1")
     free=${free% *%*}
 function df_() {
     free=$(df -B1 "$1")
     free=${free% *%*}


@@ -13,32 +20,51 @@ function df_() {
 function mv_() {
     src=$1
 
 function mv_() {
     src=$1
 

-    mkdir -p /var/stash
-    dst=$(mktemp -d /var/stash/$(basename "${src}").XXXXXX)
+    if [[ ! -e /var/stash ]]; then
+        mkdir -p /var/db/stash
+        /usr/libexec/cydia/setnsfpn /var/db/stash
+        ln -s -t /var /var/db/stash
+    elif [[ -d /var/stash ]]; then
+        /usr/libexec/cydia/setnsfpn /var/stash
+    fi
+
+    tmp=$(mktemp -d /var/stash/_.XXXXXX)
+    dst=${tmp}/${src##*/}
+
+    chmod 755 "${tmp}"
+    chown root.admin "${tmp}"
+
+    mkdir -- "${dst}" || {
+        rmdir -- "${tmp}"
+        exit 1
+    }
+
+    echo -n "${src}" >"${tmp}.lnk"

 
     if [[ -e ${src} ]]; then
         chmod --reference="${src}" "${dst}"
         chown --reference="${src}" "${dst}"
 
 
     if [[ -e ${src} ]]; then
         chmod --reference="${src}" "${dst}"
         chown --reference="${src}" "${dst}"
 

-        cp -aT "${src}" "${dst}" || {
-            rm -rf "${dst}"
+        cp -aT $v "${src}" "${dst}" || {
+            rm -rf "${tmp}"

             exit 1
         }
 
             exit 1
         }
 

-        rm -rf "${src}"
+        mv $v "${src}" "${src}.moved"
+        ln -s "${dst}" "${src}"
+        rm -rf $v "${src}.moved"

     else
         chmod 775 "${dst}"
         chown root.admin "${dst}"
     else
         chmod 775 "${dst}"
         chown root.admin "${dst}"

+        ln -s "${dst}" "${src}"

     fi
     fi

-
-    ln -s "${dst}" "${src}"

 }
 
 function shift_() {
 }
 
 function shift_() {

-    dir=$1
+    dir=${1%/}

 
     if [[ -d ${dir} && ! -h ${dir} ]]; then
 
     if [[ -d ${dir} && ! -h ${dir} ]]; then

-        used=$(du -bs "${dir}")
+        used=$(/usr/libexec/cydia/du -bs "${dir}")

         used=${used%%$'\t'*}
         free=$(df_ /var)
 
         used=${used%%$'\t'*}
         free=$(df_ /var)