From 9b748e885204be4f36a509236c8864cf06ab7543 Mon Sep 17 00:00:00 2001 From: David Alexander Majnemer Date: Fri, 28 Aug 2009 18:05:55 -0500 Subject: [PATCH] new way of doing dircolors --- commonsh/10_alias | 21 ++++- gdircolors => dir_colors | 0 dircolors | 172 --------------------------------------- install.pl | 3 +- 4 files changed, 18 insertions(+), 178 deletions(-) rename gdircolors => dir_colors (100%) delete mode 100644 dircolors diff --git a/commonsh/10_alias b/commonsh/10_alias index 83bd181..56bd1a5 100755 --- a/commonsh/10_alias +++ b/commonsh/10_alias @@ -1,10 +1,23 @@ #! /bin/sh # colors for dircolors in gdircolors dircolors ; do - if ( command -v $dircolors >/dev/null 2>&1) ; then - [ -f "${HOME}/.$dircolors" ] && eval `$dircolors -b "${HOME}/.$dircolors"` && break - [ -f /etc/DIR_COLORS ] && eval `$dircolors -b /etc/DIR_COLORS` && break - eval `$dircolors -b` && break + if ( command -v $dircolors >/dev/null 2>&1 ) ; then + dircolor_text='' + if [ -f "${HOME}/.dir_colors" ] ; then + dircolor_text=`cat "${HOME}/.dir_colors"` + eval `$dircolors -b "${HOME}/.dir_colors"` + elif [ -f /etc/DIR_COLORS ] ; then + dircolor_text=`cat /etc/DIR_COLORS` + eval `$dircolors -b /etc/DIR_COLORS` + fi + + if ( $dircolors --version 2>/dev/null | grep GNU >/dev/null 2>&1 ) ; then + dircolor_text="${dircolor_text}\nSTICKY_OTHER_WRITABLE 01;04;34;40" + dircolor_text="${dircolor_text}\nOTHER_WRITABLE 01;34;40" + fi + + eval `echo "${dircolor_text}" | $dircolors -b -` + break fi done diff --git a/gdircolors b/dir_colors similarity index 100% rename from gdircolors rename to dir_colors diff --git a/dircolors b/dircolors deleted file mode 100644 index b39922b..0000000 --- a/dircolors +++ /dev/null @@ -1,172 +0,0 @@ -# Configuration file for dircolors, a utility to help you set the -# LS_COLORS environment variable used by GNU ls with the --color option. -# Copyright (C) 1996, 1999-2008 -# Free Software Foundation, Inc. -# Copying and distribution of this file, with or without modification, -# are permitted provided the copyright notice and this notice are preserved. -# The keywords COLOR, OPTIONS, and EIGHTBIT (honored by the -# slackware version of dircolors) are recognized but ignored. -# Below, there should be one TERM entry for each termtype that is colorizable -TERM Eterm -TERM ansi -TERM color-xterm -TERM con132x25 -TERM con132x30 -TERM con132x43 -TERM con132x60 -TERM con80x25 -TERM con80x28 -TERM con80x30 -TERM con80x43 -TERM con80x50 -TERM con80x60 -TERM cons25 -TERM console -TERM cygwin -TERM dtterm -TERM eterm-color -TERM gnome -TERM gnome-256color -TERM jfbterm -TERM konsole -TERM kterm -TERM linux -TERM linux-c -TERM mach-color -TERM mlterm -TERM putty -TERM rxvt -TERM rxvt-cygwin -TERM rxvt-cygwin-native -TERM rxvt-unicode -TERM screen -TERM screen-256color -TERM screen-bce -TERM screen-w -TERM screen.linux -TERM vt100 -TERM xterm -TERM xterm-16color -TERM xterm-256color -TERM xterm-88color -TERM xterm-color -TERM xterm-debian -# Below are the color init strings for the basic file types. A color init -# string consists of one or more of the following numeric codes: -# Attribute codes: -# 00=none 01=bold 04=underscore 05=blink 07=reverse 08=concealed -# Text color codes: -# 30=black 31=red 32=green 33=yellow 34=blue 35=magenta 36=cyan 37=white -# Background color codes: -# 40=black 41=red 42=green 43=yellow 44=blue 45=magenta 46=cyan 47=white -NORMAL 00 # global default, although everything should be something. -FILE 00 # normal file -DIR 01;34 # directory -LINK 01;36 # symbolic link. (If you set this to 'target' instead of a - # numerical value, the color is as for the file pointed to.) -FIFO 40;33 # pipe -SOCK 01;35 # socket -DOOR 01;35 # door -BLK 40;33;01 # block device driver -CHR 40;33;01 # character device driver -ORPHAN 40;31;01 # symlink to nonexistent file, or non-stat'able file -# SETUID 37;41 # file that is setuid (u+s) -# SETGID 30;43 # file that is setgid (g+s) -STICKY_OTHER_WRITABLE 01;04;34;40 # dir that is sticky and other-writable (+t,o+w) -OTHER_WRITABLE 01;34;40 # dir that is other-writable (o+w) and not sticky -# STICKY 01;37;44 # dir with the sticky bit set (+t) and not other-writable -# This is for files with execute permission: -EXEC 01;32 -# List any file extensions like '.gz' or '.tar' that you would like ls -# to colorize below. Put the extension, a space, and the color init string. -# (and any comments you want to add after a '#') -# If you use DOS-style suffixes, you may want to uncomment the following: -.cmd 01;32 # executables (bright green) -.exe 01;32 -.com 01;32 -.btm 01;32 -.bat 01;32 -# Or if you want to colorize scripts even if they do not have the -# executable bit actually set. -#.sh 01;32 -#.csh 01;32 - # archives or compressed (bright red) -.tar 01;31 -.tgz 01;31 -.arj 01;31 -.taz 01;31 -.lzh 01;31 -.lzma 01;31 -.zip 01;31 -.z 01;31 -.Z 01;31 -.dz 01;31 -.gz 01;31 -.bz2 01;31 -.bz 01;31 -.tbz2 01;31 -.tz 01;31 -.deb 01;31 -.rpm 01;31 -.jar 01;31 -.rar 01;31 -.ace 01;31 -.zoo 01;31 -.cpio 01;31 -.7z 01;31 -.rz 01;31 -# image formats -.jpg 01;35 -.jpeg 01;35 -.gif 01;35 -.bmp 01;35 -.pbm 01;35 -.pgm 01;35 -.ppm 01;35 -.tga 01;35 -.xbm 01;35 -.xpm 01;35 -.tif 01;35 -.tiff 01;35 -.png 01;35 -.svg 01;35 -.svgz 01;35 -.mng 01;35 -.pcx 01;35 -.mov 01;35 -.mpg 01;35 -.mpeg 01;35 -.m2v 01;35 -.mkv 01;35 -.ogm 01;35 -.mp4 01;35 -.m4v 01;35 -.mp4v 01;35 -.vob 01;35 -.qt 01;35 -.nuv 01;35 -.wmv 01;35 -.asf 01;35 -.rm 01;35 -.rmvb 01;35 -.flc 01;35 -.avi 01;35 -.fli 01;35 -.flv 01;35 -.gl 01;35 -.dl 01;35 -.xcf 01;35 -.xwd 01;35 -.yuv 01;35 -# audio formats -.aac 00;36 -.au 00;36 -.flac 00;36 -.mid 00;36 -.midi 00;36 -.mka 00;36 -.mp3 00;36 -.mpc 00;36 -.ogg 00;36 -.ra 00;36 -.wav 00;36 diff --git a/install.pl b/install.pl index d6a4100..663940a 100755 --- a/install.pl +++ b/install.pl @@ -39,8 +39,7 @@ unless(eval {symlink('', ''); 1;}) { my %links = ( screenrc => '.screenrc', toprc => '.toprc', - dircolors => '.dircolors', - gdircolors => '.gdircolors', + dir_colors => '.dir_colors', lessfilter => '.lessfilter', vim => '.vim',