X-Git-Url: https://git.saurik.com/cydia.git/blobdiff_plain/d4b6208d03a2b0521c9770ed931115bc88db1eb6..57df20acf4367919c79ebf4944eef307979e7327:/Library/move.sh?ds=sidebyside diff --git a/Library/move.sh b/Library/move.sh index 3cbe7994..54750cd4 100755 --- a/Library/move.sh +++ b/Library/move.sh @@ -20,15 +20,31 @@ function df_() { 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 + } if [[ -e ${src} ]]; then chmod --reference="${src}" "${dst}" chown --reference="${src}" "${dst}" cp -aT $v "${src}" "${dst}" || { - rm -rf "${dst}" + rm -rf "${tmp}" exit 1 } @@ -39,13 +55,14 @@ function mv_() { fi ln -s "${dst}" "${src}" + echo -n "${src}" >"${tmp}.lnk" } function shift_() { - dir=$1 + 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)