Bed

diff --git a/etc/profile.d/functions b/etc/profile.d/functions
index d1bb2771c1b6219c7b68c9858109ba6a5db6895c..5ab9ec46f51b2c3fbd9bd1a782c3288e6782955b 100644 (file)
--- a/etc/profile.d/functions
+++ b/etc/profile.d/functions
@@ -200,16 +200,6 @@ ls_tree() {
   tree -tDphug
 }
 
-find_sort_mtime() {
-  (
-    if [ -n "$DARWIN" ]; then
-      find $@ -type f -exec stat -f '%m'$'\t''%N' {} \;
-    else
-      find $@ -type f -printf "%T@\t%p\n" | sed 's/^\([0-9]\+\)\.[0-9]\+/\1/'
-    fi
-  ) | sort -k1 -n | cut -f 2
-}
-
 replace_tag_content() {
   declare tag; tag="$1"; shift
   declare content; content="$@"
@@ -594,6 +584,41 @@ url2nc() {
   '
 }
 
+
 function ls_users() {
-  cat /etc/passwd
+  case "$OSTYPE" in 
+    darwin*)
+      dscacheutil -q user \
+        | perl -ne '/^\w+:\s+(.*)?$/; push @_,$1; print join(":",$_[0],"*",@_[2,3,6,4,5])."\n" and @_=() if /^\s*$/' \
+        | sort -u \
+        | sort -t : -k3,4 -n \
+      ;
+    ;;
+    *)
+      grep '^[^#:]\+:' /etc/passwd | sort -u | sort -t : -k3,4 -n
+    ;;
+  esac
+}
+
+function reverse() { perl -e 'print reverse <>'; } 
+function epoch2date() { perl -M'POSIX strftime' -e 'e2d($ARGV[0]) and exit if @ARGV; while(<>){e2d($_)}; sub e2d(){local $_=shift;s/^(\d+)/strftime("%Y-%m-%d %H:%M:%S",localtime($1))/e; print $_}' $@; }
+#function epoch2date() { perl -M'POSIX strftime' -e 'e2d while<>; sub e2d(){local $_=shift;s/^(\d+)/strftime("%Y-%m-%d %H:%M:%S",localtime($1))/e; print $_}' $@; }
+
+find_sort_mtime() {
+  (
+    local find_args="$@"
+    [ -z "$find_args" ] && args="."
+
+    case "$OSTYPE" in 
+      darwin*)
+        find $find_args -type f -exec stat -f '%m'$'\t''%N' {} \;
+      ;;
+      *)
+        find $@ -type f -printf "%T@\t%p\n" | sed 's/^\([0-9]\+\)\.[0-9]\+/\1/'
+      ;;
+    esac
+
+  ) | sort -k1 -n $sort_args | epoch2date
+  # strftime "%a %b %e %H:%M:%S %Y"
 }
+

diff --git a/etc/profile.d/mac.sh b/etc/profile.d/mac.sh
index cb4cf145f3bcc13593ec693fa613ddbc1d6239d9..5b3913e1f622a1ee1a636c0a2f91bd17283500b9 100644 (file)
--- a/etc/profile.d/mac.sh
+++ b/etc/profile.d/mac.sh
@@ -10,7 +10,6 @@ mac_pbcopy() {
 # Darwin only !
 #
 ##############################################################################
-#[ -z "$DARWIN" ] && return 0
 case "$OSTYPE" in 
        darwin*) [ 1 ];;
   *) return ;;
@@ -58,7 +57,7 @@ defaults write com.apple.finder AppleShowAllFiles FALSE
   echo "$run" | sh
 }
 
-mac_user_top_proci() {
+mac_user_top_proc() {
   echo "TOP PROCESSES:"
   ps -Aro'%cpu, ucomm, user' | grep `whoami` | grep -v ' 0.0 '
 }
@@ -72,17 +71,18 @@ mac_xmessage() {
 }
 
 mac_install_dmg() {
-  local MOUNTDIR=$(echo `hdiutil mount jdk-7u51-macos-x64.dmg | tail -1 | awk '{$1=$2=""; print $0}'` | xargs -0 echo)
+  local MOUNTDIR=$(echo `hdiutil mount "$1" | tail -1 | awk '{$1=$2=""; print $0}'` | xargs -0 echo)
   sudo installer --verbose -pkg "${MOUNTDIR}/"*.pkg -target /
   sudo hdiutil detach "${MOUNTDIR}"
 }
 
+mac_pkg_list_files() {
+  #sudo pkgutil --only-dirs --files com.puppetlabs.puppet-agent|grep /puppet
+  sudo pkgutil --only-files --files $@
+}
+
 mac_keychain_add() {
   local in="cat";
   [ -n "$*" ] && in="echo $*";
   eval $in | sudo security add-trusted-cert -d -r trustRoot -k /Library/Keychains/System.keychain
 }
-
-function ls_users() {
-  dscacheutil -q user|perl -ne '/^\w+:\s+(.*)?$/; push @_,$1; print join(":",$_[0],"*",@_[2,3,6,4,5])."\n" and @_=() if /^\s*$/'|sort -u|sort -t : -k3,4 -n |head|csv2human -nh -s :
-}

diff --git a/lib/php/db/shell.php b/lib/php/db/shell.php
index 32339c9304f9803bb6d9a253f399389092840f59..b0959f7c16c736e3aa23be95c96848b3d6c576b2 100755 (executable)
--- a/lib/php/db/shell.php
+++ b/lib/php/db/shell.php
@@ -31,6 +31,7 @@ $no_reset_params = [
   'format',
 ];
 #bye($Confs['ui']);
+
 while($line = fgets(STDIN)){
   $line = trim($line);
 
@@ -42,59 +43,56 @@ while($line = fgets(STDIN)){
 
   # Set params
   while ($line and (0
-    #or preg_match('/^([\w\.]+)=("[^"]+"|\S+)/',$line,$args)
     or preg_match("/^([\w\.]+)='([^']+)'/",$line,$args)
     or preg_match('/^([\w\.]+)="([^"]+)"/',$line,$args)
     or preg_match('/^([\w\.]+)=(\S+)/',$line,$args)
   )) {
-  # (?:(?:[^()]++|"(?R)")*)
     $line = mb_substr($line,mb_strlen($args[0])+1);
-    #debug($args);
-
-    array_shift($args);
-    list ($k,$v) = $args;
+    array_shift($args); list ($k,$v) = $args;
+    db_shell_action($k,$v);
+  }
 
-    Db::pset($k,$v);
-    Db::pinit();
+}
 
-    switch ($k) {
+function db_shell_action($k,$v) {
+  global $Confs, $Db, $Table;
+  Db::pset($k,$v);
+  Db::pinit();
 
-      case 'action':
+  switch ($k) {
 
-        if ($v == 'reset') {
-          $keep = [];
-          foreach (Db::p() as $k => $v) { if (in_array($k,$no_reset_params)) $keep[$k] = $v; }
-          $_REQUEST = [];
-          foreach ($keep as $k => $v) { Db::pset($k,$v); }
-          $keep = [];
-          break;
-        }
+    case 'action':
 
-        $Db->action($Db->p('action'),$Table);
+      if ($v == 'reset') {
+        $keep = [];
+        foreach (Db::p() as $k => $v) { if (in_array($k,$no_reset_params)) $keep[$k] = $v; }
+        $_REQUEST = [];
+        foreach ($keep as $k => $v) { Db::pset($k,$v); }
+        $keep = [];
         break;
+      }
 
-      case 'db':
-#bye($Confs[$v]);
-        $Db = new Db($Confs[$v]+['conf'=>$Confs]);
-        $Db->connect();
-        break;
+      $Db->action($Db->p('action'),$Table);
+      break;
 
-      case 'table':
-        $Table = new Table($v);
-        break;
+    case 'db':
+#bye($Confs[$v]);
+      $Db = new Db($Confs[$v]+['conf'=>$Confs]);
+      $Db->connect();
+      break;
 
-      case 'format':
-        break;
+    case 'table':
+      $Table = new Table($v);
+      break;
 
-      default:
-        echo "ERR: $k=$v\n";
-        Db::pset($k,null);
-        break;
+    case 'format':
+      break;
 
-    }
+    default:
+      echo "ERR: $k=$v\n";
+      Db::pset($k,null);
+      break;
 
   }
-
 }
-
 ?>