etc/profile.d/aliases

diff --git a/etc/profile.d/aliases b/etc/profile.d/aliases
index a0d821a01e5f5b1121ae7ced4f9309f0022c32cb..175de74263f8ad4d8c160d5a54adf93a7dcc71b1 100644 (file)
--- a/etc/profile.d/aliases
+++ b/etc/profile.d/aliases
@@ -5,32 +5,17 @@
 #################################################################################
 [ -n "$MYVIMRC" -a -n "$BASH" ] && shopt -s expand_aliases
 
-#--------------------------------------------------------------------------------
-# Others
-#
-which blkid 1>/dev/null && alias uuid-hds='blkid -o full -s UUID'
-which dpkg-query 1>/dev/null && alias dpkg_sort_size="dpkg-query -Wf '${Installed-Size}\t${Package}\n' | sort -n"
-which apg 1>/dev/null && alias password_gener_apg='apg -m 12 -x 12 -a 0 -M L|head -1;'
-which mysql 1>/dev/null && alias mysqlshow_view="mysql -e \"SHOW FULL TABLES WHERE TABLE_TYPE LIKE 'VIEW'\""
-which nmap 1>/dev/null && alias nmap_ping="nmap -sP -PE -PS443 -PA21,22,23,80,3389"
-which arp 1>/dev/null && alias arp_list="arp -an"
-which gs 1>/dev/null && alias pdf2jpegs='gs -dNOPAUSE -sDEVICE=jpeg -dFirstPage=1 -dLastPage=5 -sOutputFile=pdf2jpegs%d.jpg -dJPEGQ=100 -r500 -c quit'
-which maildirmake 1>/dev/null && alias maildir_make="maildirmake -S Maildir; for d in Spam Trash Sent;do maildirmake -f $d Maildir; done"
-
-#--------------------------------------------------------------------------------
-# Beep
-#
 alias beep='printf "\a"'
 
-#--------------------------------------------------------------------------------
-# bc
-#
-bc --version > /dev/null 2>&1 && alias bc="bc -q"
-
-#--------------------------------------------------------------------------------
-# vim
-#
-vim --version > /dev/null 2>&1 && alias vi=vim
+which blkid > /dev/null && alias uuid-hds='blkid -o full -s UUID'
+which dpkg-query > /dev/null && alias dpkg_sort_size="dpkg-query -Wf '${Installed-Size}\t${Package}\n' | sort -n"
+which mysql > /dev/null && alias mysqlshow_view="mysql -e \"SHOW FULL TABLES WHERE TABLE_TYPE LIKE 'VIEW'\""
+which nmap > /dev/null && alias nmap_ping="nmap -sP -PE -PS443 -PA21,22,23,80,3389"
+which arp > /dev/null && alias arp_list="arp -an"
+which gs > /dev/null && alias pdf2jpegs='gs -dNOPAUSE -sDEVICE=jpeg -dFirstPage=1 -dLastPage=5 -sOutputFile=pdf2jpegs%d.jpg -dJPEGQ=100 -r500 -c quit'
+which maildirmake > /dev/null && alias maildir_make="maildirmake -S Maildir; for d in Spam Trash Sent;do maildirmake -f $d Maildir; done"
+which bc > /dev/null && alias bc="bc -q"
+which vim > /dev/null && alias vi=vim
 
 #--------------------------------------------------------------------------------
 # ls

diff --git a/etc/profile.d/functions b/etc/profile.d/functions
index 0f2d427f81fef18bf9cc88b1ec4a33d9b12fccbd..a376b33bf4262b05d6352ad8f6f6ec513c272564 100644 (file)
--- a/etc/profile.d/functions
+++ b/etc/profile.d/functions
@@ -820,24 +820,8 @@ http_head() {
 }
 
 password_create() {
-  declare length=12 encrypt=0
-  while [ $# -gt 0 ]; do
-
-    case "$1" in
-
-     -*help|-h) echo "Usage: $FUNCNAME [LENGTH default:12] -encrypt"; return ;;
-
-     -*encrypt) encrypt=1 ;;
-
-     *) length=$1 ;;
-
-    esac
-    shift
-
-  done
-  declare password=`apg -m $length -x $length -a 0 -M L | head -1`
-  [ "$encrypt" == "1" ] && password="$password "`echo "$password" | makepasswd --clearfrom=- --crypt-md5 | sed 's/^.*\(\$.*\)$/\1/'`
-  echo "$password"
+  tr -cd '[:alnum:]' < /dev/urandom | head -c${1:-30}
+  echo
 }
 
 #unset _which_cache