From 563c19b2cc82950e302db4049b8d5afbe8e1aa92 Mon Sep 17 00:00:00 2001
From: Jinnan Wang <jnwang@linx-info.com>
Date: Tue, 18 Mar 2014 14:33:29 +0800
Subject: [PATCH] =?UTF-8?q?=09=E5=88=A0=E9=99=A4=E6=8A=80=E6=9C=AF?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E9=83=A8=E9=97=A8=E7=9A=84=E5=9B=9E=E6=94=B6?=
 =?UTF-8?q?=E7=AB=99=E6=9C=BA=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 install_shell/set_recycling-station.sh     | 46 ------------
 install_shell/set_recycling-station.sh.bak | 83 ----------------------
 setup.sh                                   |  3 -
 3 files changed, 132 deletions(-)
 delete mode 100755 install_shell/set_recycling-station.sh
 delete mode 100755 install_shell/set_recycling-station.sh.bak

diff --git a/install_shell/set_recycling-station.sh b/install_shell/set_recycling-station.sh
deleted file mode 100755
index 9c0e29f..0000000
--- a/install_shell/set_recycling-station.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash
-#set_recycling-station.sh
-#Linux回收站，改写rm防止误删文件引起无法恢复
-
-#Jincheng Ye
-#2013/05/14
-#modified by Jincheng Ye,2013/10/28
-grep trash /root/.bashrc &> /dev/null
-if [ $? -eq 0 ];then
-	echo "trash exist..."
-else
-
-cat >> /root/.bashrc <<EOF
-#Linux回收站，改写rm,防止bash用户误删文件引起无法恢复
-mkdir -p ~/.trash
-alias rm=trash
-alias r=trash
-alias rl='ls ~/.trash'
-alias ur=undelfile
-#回收函数
-undelfile()
-{
-	mv -i ~/.trash/\$@ ./
-}
-#垃圾函数,该函数不删除系统重要目录下的重要文件，如果用户实在想删除，可以指定rm命令的路径来完成原来rm的功能，如:
-#/bin/rm  /opt/test.sh
-trash()
-{
-#Can't delete / /s* /b* /l* /d* /e* /u* /r* /v* /h* /o* /p* /* ~ ~/*
-	if [[ \$@ != /[sbldeurvhop]* ]] && [[ \$@ != "/" ]] && [[ \$@ != "/*" ]] && [[ \$@ != ~* ]]
-	then
-		mv \$@  ~/.trash/
-	else
-		echo "Can't delete \$@!"
-	fi
-}
-#清除垃圾回收站的内容的函数
-cleartrash()
-{
-	read -p "clear sure?[y/n]" confirm
-	[ ${confirm} == 'y' ]||[ ${confirm} == 'Y' ] && /bin/rm -rf ~/.trash/*
-}
-
-EOF
-
-fi
diff --git a/install_shell/set_recycling-station.sh.bak b/install_shell/set_recycling-station.sh.bak
deleted file mode 100755
index cae1d43..0000000
--- a/install_shell/set_recycling-station.sh.bak
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/bin/bash
-#set_recycling-station.sh
-#Linux回收站，改写rm防止误删文件引起无法恢复
-
-#Jincheng Ye
-#2013/05/14
-
-grep trash /etc/profile &> /dev/null
-if [ $? -eq 0 ];then
-	echo "trash exist..."
-else
-
-cat >> /etc/profile <<EOF
-#Linux回收站，改写rm,防止bash用户误删文件引起无法恢复
-mkdir -p ~/.trash
-alias rm=trash
-alias r=trash
-alias rl='ls ~/.trash'
-alias ur=undelfile
-#回收函数
-undelfile()
-{
-	mv -i ~/.trash/\$@ ./
-}
-#垃圾函数,该函数不删除系统重要目录下的重要文件，如果用户实在想删除，可以指定rm命令的路径来完成原来rm的功能，如:
-#/bin/rm  /opt/test.sh
-trash()
-{
-#Can't delete / /s* /b* /l* /d* /e* /u* /r* /v* /h* /o* /p* /* ~ ~/*
-	if [[ \$@ != /[sbldeurvhop]* ]] && [[ \$@ != "/" ]] && [[ \$@ != "/*" ]] && [[ \$@ != ~* ]]
-	then
-		mv \$@  ~/.trash/
-	else
-		echo "Can't delete \$@!"
-	fi
-}
-#清除垃圾回收站的内容的函数
-cleartrash()
-{
-	read -p "clear sure?[y/n]" confirm
-	[ ${confirm} == 'y' ]||[ ${confirm} == 'Y' ] && /bin/rm -rf ~/.trash/*
-}
-
-EOF
-cat >> ~/.bashrc <<EOF
-#Linux回收站，改写rm,防止bash用户误删文件引起无法恢复
-mkdir -p ~/.trash
-alias rm=trash
-alias r=trash
-alias rl='ls ~/.trash'
-alias ur=undelfile
-#回收函数
-undelfile()
-{
-	mv -i ~/.trash/\$@ ./
-}
-#垃圾函数,该函数不删除系统重要目录下的重要文件，如果用户实在想删除，可以指定rm命令的路径来完成原来rm的功能，如:
-#/bin/rm  /opt/test.sh
-trash()
-{
-#Can't delete / /s* /b* /l* /d* /e* /u* /r* /v* /h* /o* /p* /* ~ ~/*
-	if [[ \$@ != /[sbldeurvhop]* ]] && [[ \$@ != "/" ]] && [[ \$@ != "/*" ]] && [[ \$@ != ~* ]]
-	then
-		mv \$@  ~/.trash/
-	else
-		echo "Can't delete \$@!"
-	fi
-}
-#清除垃圾回收站的内容的函数
-cleartrash()
-{
-	read -p "clear sure?[y/n]" confirm
-	[ ${confirm} == 'y' ]||[ ${confirm} == 'Y' ] && /bin/rm -rf ~/.trash/*
-}
-
-EOF
-
-cat >> /etc/csh.cshrc <<EOF
-#由于cshell脚本编程中没有函数，因此仅在cshell用户中删除时进行提示
-alias rm 'rm -i' 
-EOF
-
-fi
diff --git a/setup.sh b/setup.sh
index 8cd2039..10752c2 100755
--- a/setup.sh
+++ b/setup.sh
@@ -31,9 +31,6 @@ echo "====add fonts===="
 ./set_limits.conf.sh
 echo "====Set limits.conf===="
 
-./set_recycling-station.sh
-echo "===Set trash recycling station==="
-
 ./set_fstab.sh
 echo "===Set /etc/fstab==="