arcanis/arcanis.me
1
0
Fork 0
mirror of https://github.com/arcan1s/arcanis.me.git synced 2025-04-24 23:37:19 +00:00
Code Issues Projects Releases Wiki Activity

edited rm function

Browse Source
This commit is contained in:
arcan1s 2014-01-31 02:50:41 +04:00
parent 8c49a0717d
commit 99c43a5420
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
_posts/2014-01-14-about-zshrc.html
View File

@ -446,7 +446,7 @@ rm () {
[[ ! $CONFIRM =~ [yY] ]] && return 1 [[ ! $CONFIRM =~ [yY] ]] && return 1
# move # move
for FILE in "$@"; do for FILE in "$@"; do
DESTFILE="$(basename "${FILE}")" DESTFILE="$(basename -- "${FILE}")"
SUFFIX=''; SUFFIX='';
ITER=0; ITER=0;
while [ -e "${TRASHFILE}/${DESTFILE}${SUFFIX}" ]; do while [ -e "${TRASHFILE}/${DESTFILE}${SUFFIX}" ]; do
@ -454,8 +454,13 @@ rm () {
ITER=$(expr ${ITER} + 1) ITER=$(expr ${ITER} + 1)
done done
echo "Remove '${FILE}'" echo "Remove '${FILE}'"
mv -- "${FILE}" "${TRASHFILE}/${DESTFILE}${SUFFIX}" || return 1 if [ "$(dirname -- "$(realpath -- "${FILE}")")" == "${TRASHFILE}" ]; then
echo "[Trash Info]\nPath=$(realpath "${FILE}")\nDeletionDate=$(date +%Y-%m-%dT%H:%M:%S)" > "${TRASHINFO}/${DESTFILE}${SUFFIX}.trashinfo" || return 1 /usr/bin/rm -rf -- "${FILE}"
/usr/bin/rm -rf -- "${TRASHINFO}/${DESTFILE}.trashinfo"
else
mv -- "${FILE}" "${TRASHFILE}/${DESTFILE}${SUFFIX}" || return 1
echo "[Trash Info]\nPath=$(realpath -- "${FILE}")\nDeletionDate=$(date +%Y-%m-%dT%H:%M:%S)" > "${TRASHINFO}/${DESTFILE}${SUFFIX}.trashinfo" || return 1
fi
done done
} }
{% endhighlight %} {% endhighlight %}

11
ru/_posts/2014-01-14-about-zshrc.html
View File

@ -446,7 +446,7 @@ rm () {
[[ ! $CONFIRM =~ [yY] ]] && return 1 [[ ! $CONFIRM =~ [yY] ]] && return 1
# move # move
for FILE in "$@"; do for FILE in "$@"; do
DESTFILE="$(basename "${FILE}")" DESTFILE="$(basename -- "${FILE}")"
SUFFIX=''; SUFFIX='';
ITER=0; ITER=0;
while [ -e "${TRASHFILE}/${DESTFILE}${SUFFIX}" ]; do while [ -e "${TRASHFILE}/${DESTFILE}${SUFFIX}" ]; do
@ -454,8 +454,13 @@ rm () {
ITER=$(expr ${ITER} + 1) ITER=$(expr ${ITER} + 1)
done done
echo "Remove '${FILE}'" echo "Remove '${FILE}'"
mv -- "${FILE}" "${TRASHFILE}/${DESTFILE}${SUFFIX}" || return 1 if [ "$(dirname -- "$(realpath -- "${FILE}")")" == "${TRASHFILE}" ]; then
echo "[Trash Info]\nPath=$(realpath "${FILE}")\nDeletionDate=$(date +%Y-%m-%dT%H:%M:%S)" > "${TRASHINFO}/${DESTFILE}${SUFFIX}.trashinfo" || return 1 /usr/bin/rm -rf -- "${FILE}"
/usr/bin/rm -rf -- "${TRASHINFO}/${DESTFILE}.trashinfo"
else
mv -- "${FILE}" "${TRASHFILE}/${DESTFILE}${SUFFIX}" || return 1
echo "[Trash Info]\nPath=$(realpath -- "${FILE}")\nDeletionDate=$(date +%Y-%m-%dT%H:%M:%S)" > "${TRASHINFO}/${DESTFILE}${SUFFIX}.trashinfo" || return 1
fi
done done
} }
{% endhighlight %} {% endhighlight %}