浏览代码

Update Solaris changes to use OSTYPE and zsh datetime module.

Moinak Ghosh 9 年之前
父节点
当前提交
5f38a537ce
共有 4 个文件被更改,包括 6 次插入11 次删除
  1. 1 1
      lib/completion.zsh
  2. 0 1
      oh-my-zsh.sh
  3. 1 1
      plugins/colored-man/colored-man.plugin.zsh
  4. 4 8
      tools/check_for_upgrade.sh

+ 1 - 1
lib/completion.zsh

@@ -25,7 +25,7 @@ bindkey -M menuselect '^o' accept-and-infer-next-history
 
 zstyle ':completion:*:*:*:*:*' menu select
 zstyle ':completion:*:*:kill:*:processes' list-colors '=(#b) #([0-9]#) ([0-9a-z-]#)*=01;34=0=01'
-if [ "$PLAT" = "SunOS" ]
+if [ "$OSTYPE[0,7]" = "solaris" ]
 then
   zstyle ':completion:*:*:*:*:processes' command "ps -u `whoami` -o pid,user,comm"
 else

+ 0 - 1
oh-my-zsh.sh

@@ -1,4 +1,3 @@
-PLAT=`uname -s`
 # Check for updates on initial load...
 if [ "$DISABLE_AUTO_UPDATE" != "true" ]; then
   /usr/bin/env ZSH=$ZSH DISABLE_UPDATE_PROMPT=$DISABLE_UPDATE_PROMPT zsh -f $ZSH/tools/check_for_upgrade.sh

+ 1 - 1
plugins/colored-man/colored-man.plugin.zsh

@@ -1,4 +1,4 @@
-if [ "${PLAT}" = "SunOS" ]
+if [ "$OSTYPE[0,7]" = "solaris" ]
 then
 	if [ ! -x ${HOME}/bin/nroff ]
 	then

+ 4 - 8
tools/check_for_upgrade.sh

@@ -1,13 +1,9 @@
-#!/bin/sh
+#!/usr/bin/env zsh
+
+zmodload zsh/datetime
 
-PLAT=`uname -s`
 function _current_epoch() {
-  if [ "$PLAT" = "SunOS" ]
-  then
-    echo $(($(perl -e 'print time') / 60 / 60 / 24))
-  else
-    echo $(($(date +%s) / 60 / 60 / 24))
-  fi
+  echo $EPOCHSECONDS
 }
 
 function _update_zsh_update() {