Update.

[scripts.git] / bashrc

diff --git a/bashrc b/bashrc
index 178504e..4e736e6 100644 (file)
--- a/bashrc
+++ b/bashrc
@@ -23,11 +23,11 @@ PRIVATE_BASHRC="${HOME}/private/bashrc.perso"
 
 # If the MANPATH is not set, set it
 
-[ "${MANPATH}" ] || MANPATH=$(manpath)
+[[ "${MANPATH}" ]] || MANPATH=$(manpath)
 
 # If the private bashrc exists, execute it
 
-[ -f "${PRIVATE_BASHRC}" ] && source "${PRIVATE_BASHRC}"
+[[ -f "${PRIVATE_BASHRC}" ]] && source "${PRIVATE_BASHRC}"
 
 # !!! THIS HAS TO BE HERE EVEN IN THE NON-INTERACTIVE PART OR YOU WILL
 # LOSE YOU PREVIOUS HISTORY !!!
@@ -168,7 +168,9 @@ function latexdiff () {
 # corresponding tex file
 
 function rl () {
-    RECENT_LOG=$(ls -t $(find -maxdepth 1 -name "*.log" -type f) | head -1)
+    # RECENT_LOG=$(ls -t $(find -maxdepth 1 -name "*.log" -type f) | head -1)
+
+    RECENT_LOG=$(ls -t *.log | head -1)
 
     if [[ ${RECENT_LOG} ]]; then
         FILEBASE="${RECENT_LOG/.log/}"
@@ -238,10 +240,11 @@ function bak () {
     done
 }
 
-# Password generator
+# A password generator
 
-function pwgen () {
+function genpw () {
     tr -dc A-Za-z0-9 < /dev/urandom | head -c16
+    # tr -dc [:graph:] < /dev/urandom | head -c16
     echo
 }
 
@@ -623,6 +626,12 @@ alias ripcd=abcde
 
 function mksmall () {
 
+    if [[ "$1" == "--params" ]]; then
+        shift
+        PARAMS="$1"
+        shift
+    fi
+
     [[ "${PARAMS}" ]] || PARAMS="-geometry 800x600"
 
     # Auto-orient does not seem to work at all, hence the ugly hack
@@ -710,25 +719,19 @@ else
 
     [[ "${IDENT}" ]] && IDENT="${IDENT}:"
 
-    # If we are root, show that in red
-
     if [[ ${USER} == "root" ]]; then
+        # If we are root, show that in red
         PS1="\[${VT_RED_BG}${VT_WHITE_FG}\]${IDENT}\w\[${VT_RESET}\] "
     else
-        PS1="\[${VT_WHITE_BG}${VT_BLACK_FG}\]${IDENT}\w\[${VT_RESET}\] "
+        if [[ $(\grep QEMU /proc/cpuinfo) ]]; then
+            # If we are in a qemu virtual machine, in yellow
+            PS1="\[${VT_YELLOW_BG}${VT_BLACK_FG}\]${IDENT}\w\[${VT_RESET}\] "
+        else
+            # Otherwise in white
+            PS1="\[${VT_WHITE_BG}${VT_BLACK_FG}\]${IDENT}\w\[${VT_RESET}\] "
+        fi
     fi
 
-    # In an xterm, show the hostname and path in the title bar, highlight
-    # the prompt
-
-    # [[ "${TERMS_WITH_BAR}" ]] || TERMS_WITH_BAR="^xterm|screen$"
-
-    # if [[ "${TERM}" =~ "${TERMS_WITH_BAR}" ]]; then
-    # PS1="\[${VT_SET_TITLE}shell@\h (\w)${VT_END_TITLE}${VT_WHITE_BG}\]${IDENT}\w\[${VT_RESET}\] "
-    # else
-    # PS1="\[${VT_WHITE_BG}\]${IDENT}\w\[${VT_RESET}\] "
-    # fi
-
 fi
 
 ######################################################################
@@ -858,6 +861,9 @@ function lsn () {
 ######################################################################
 
 function prompt_command () {
+    # if [[ $(umask) != 0022 ]]; then
+        # echo "Umask changed to $(umask)"
+    # fi
     # save the history after every command to avoid loosing some when
     # multiple shells are open
     history -a