Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=86eb1311b01f7d43dbea40a21ea3ec428e5ede52
commit 86eb1311b01f7d43dbea40a21ea3ec428e5ede52 Author: crazy <[email protected]> Date: Tue Jan 9 03:36:25 2018 +0100 coreutils-8.29-2-x86_64 * pkgrel++ * fix whole *colors being broken forever * added gentoo uname patch to display full CPU string * added ls and grep color alias diff --git a/source/base/coreutils/003_all_coreutils-gentoo-uname.patch b/source/base/coreutils/003_all_coreutils-gentoo-uname.patch new file mode 100644 index 0000000..21c8d72 --- /dev/null +++ b/source/base/coreutils/003_all_coreutils-gentoo-uname.patch @@ -0,0 +1,189 @@ +From 8ff53d1ff250c8311efac7f2a8799801e3f0afb4 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <[email protected]> +Date: Wed, 5 Aug 2015 07:45:29 +0000 +Subject: [PATCH 1/4] uname: Add --processor/--hardware-platform option + +On linux platforms, grok /proc/cpuinfo for the CPU/vendor info. + +Prob not suitable for upstream seeing as how it's 100% linux-specific +http://lists.gnu.org/archive/html/bug-coreutils/2005-09/msg00063.html + +Patch originally by Carlos E. Gorges <[email protected]>, but +heavily reworked to suck less. + +To add support for additional platforms, check out the show_cpuinfo() +func in the linux/arch/<ARCH>/ source tree of the kernel. +--- + src/uname.c | 129 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- + 1 file changed, 128 insertions(+), 1 deletion(-) + +diff --git a/src/uname.c b/src/uname.c +index 6635a6a8e..30c04f5be 100644 +--- a/src/uname.c ++++ b/src/uname.c +@@ -49,6 +49,12 @@ + # include <mach-o/arch.h> + #endif + ++#if defined (__linux__) ++# define USE_PROCINFO ++# define UNAME_HARDWARE_PLATFORM ++#endif ++ ++#include "ignore-value.h" + #include "system.h" + #include "die.h" + #include "error.h" +@@ -154,6 +160,119 @@ Print machine architecture.\n\ + exit (status); + } + ++#if defined (USE_PROCINFO) ++ ++# if defined (__s390__) || defined (__s390x__) ++# define CPUINFO_FILE "/proc/sysinfo" ++# define CPUINFO_FORMAT "%64[^\t :]%*[ :]%256[^\n]%c" ++# else ++# define CPUINFO_FILE "/proc/cpuinfo" ++# define CPUINFO_FORMAT "%64[^\t:]\t:%256[^\n]%c" ++# endif ++ ++# define PROCINFO_PROCESSOR 0 ++# define PROCINFO_HARDWARE_PLATFORM 1 ++ ++static void __eat_cpuinfo_space (char *buf) ++{ ++ /* First eat trailing space. */ ++ char *tmp = buf + strlen (buf) - 1; ++ while (tmp > buf && isspace (*tmp)) ++ *tmp-- = '\0'; ++ /* Then eat leading space. */ ++ tmp = buf; ++ while (*tmp && isspace (*tmp)) ++ tmp++; ++ if (tmp != buf) ++ memmove (buf, tmp, strlen (tmp) + 1); ++ /* Finally collapse whitespace. */ ++ tmp = buf; ++ while (tmp[0] && tmp[1]) { ++ if (isspace (tmp[0]) && isspace (tmp[1])) { ++ memmove (tmp, tmp + 1, strlen (tmp)); ++ continue; ++ } ++ ++tmp; ++ } ++} ++ ++static int __linux_procinfo (int x, char *fstr, size_t s) ++{ ++ FILE *fp; ++ ++ const char * const procinfo_keys[] = { ++ /* --processor --hardware-platform */ ++ #if defined (__alpha__) ++ "cpu model", "system type" ++ #elif defined (__arm__) ++ /* linux-3.8+ uses "model name", but older uses "Processor". */ ++ "model name", "Hardware" ++ #elif defined (__avr32__) ++ "processor", "cpu family" ++ #elif defined (__bfin__) ++ "CPU", "BOARD Name" ++ #elif defined (__cris__) ++ "cpu", "cpu model" ++ #elif defined (__frv__) ++ "CPU-Core", "System" ++ #elif defined (__i386__) || defined (__x86_64__) ++ "model name", "vendor_id" ++ #elif defined (__ia64__) ++ "model name", "vendor" ++ #elif defined (__hppa__) ++ "cpu", "model" ++ #elif defined (__m68k__) ++ "CPU", "MMU" ++ #elif defined (__microblaze__) ++ "CPU-Ver", "FPGA-Arch" ++ #elif defined (__mips__) ++ "cpu model", "system type" ++ #elif defined (__powerpc__) || defined (__powerpc64__) ++ "cpu", "machine" ++ #elif defined (__s390__) || defined (__s390x__) ++ "Type", "Manufacturer" ++ #elif defined (__sh__) ++ "cpu type", "machine" ++ #elif defined (sparc) || defined (__sparc__) ++ "type", "cpu" ++ #elif defined (__vax__) ++ "cpu type", "cpu" ++ #else ++ "unknown", "unknown" ++ #endif ++ }; ++ ++ if ((fp = fopen (CPUINFO_FILE, "r")) != NULL) { ++ char key[65], value[257], eol, *ret = NULL; ++ ++ while (fscanf (fp, CPUINFO_FORMAT, key, value, &eol) != EOF) { ++ __eat_cpuinfo_space (key); ++ if (!strcmp (key, procinfo_keys[x])) { ++ __eat_cpuinfo_space (value); ++ ret = value; ++ break; ++ } ++ if (eol != '\n') { ++ /* We need two fscanf's here in case the previous length limit ++ * caused us to read right up to the newline. Doing something ++ * like "%*[^\n]\n" won't eat the newline. */ ++ ignore_value (fscanf (fp, "%*[^\n]")); ++ ignore_value (fscanf (fp, "\n")); ++ } ++ } ++ fclose (fp); ++ ++ if (ret) { ++ strncpy (fstr, ret, s); ++ return 0; ++ } ++ } ++ ++ return -1; ++} ++ ++#endif ++ + /* Print ELEMENT, preceded by a space if something has already been + printed. */ + +@@ -301,10 +420,14 @@ main (int argc, char **argv) + if (toprint & PRINT_PROCESSOR) + { + char const *element = unknown; +-#if HAVE_SYSINFO && defined SI_ARCHITECTURE ++#if (HAVE_SYSINFO && defined SI_ARCHITECTURE) || defined (USE_PROCINFO) + { + static char processor[257]; ++#if defined (USE_PROCINFO) ++ if (0 <= __linux_procinfo (PROCINFO_PROCESSOR, processor, sizeof processor)) ++#else + if (0 <= sysinfo (SI_ARCHITECTURE, processor, sizeof processor)) ++#endif + element = processor; + } + #endif +@@ -357,9 +480,13 @@ main (int argc, char **argv) + if (element == unknown) + { + static char hardware_platform[257]; ++#if defined (USE_PROCINFO) ++ if (0 <= __linux_procinfo (PROCINFO_HARDWARE_PLATFORM, hardware_platform, sizeof hardware_platform)) ++#else + size_t s = sizeof hardware_platform; + static int mib[] = { CTL_HW, UNAME_HARDWARE_PLATFORM }; + if (sysctl (mib, 2, hardware_platform, &s, 0, 0) >= 0) ++#endif + element = hardware_platform; + } + #endif +-- +2.15.1 + diff --git a/source/base/coreutils/030_all_coreutils-more-dir-colors.patch b/source/base/coreutils/030_all_coreutils-more-dir-colors.patch new file mode 100644 index 0000000..de88473 --- /dev/null +++ b/source/base/coreutils/030_all_coreutils-more-dir-colors.patch @@ -0,0 +1,52 @@ +diff -Naur coreutils-8.29/src/dircolors.hin coreutils-8.29-p/src/dircolors.hin +--- coreutils-8.29/src/dircolors.hin 2017-01-21 17:05:58.000000000 +0100 ++++ coreutils-8.29-p/src/dircolors.hin 2018-01-09 03:14:45.704698551 +0100 +@@ -8,6 +8,9 @@ + # The keywords COLOR, OPTIONS, and EIGHTBIT (honored by the + # slackware version of dircolors) are recognized but ignored. + ++# You can copy this file to .dir_colors in your $HOME directory to override ++# the system defaults. ++ + # Below are TERM entries, which can be a glob patterns, to match + # against the TERM environment variable to determine if it is colorizable. + TERM Eterm +@@ -55,8 +58,8 @@ + 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 ... +-MISSING 00 # ... and the files they point to ++ORPHAN 01;05;37;41 # symlink to nonexistent file, or non-stat'able file ... ++MISSING 01;05;37;41 # ... and the files they point to + SETUID 37;41 # file that is setuid (u+s) + SETGID 30;43 # file that is setgid (g+s) + CAPABILITY 30;41 # file with capability +@@ -130,6 +133,7 @@ + .swm 01;31 + .dwm 01;31 + .esd 01;31 ++.fpm 01;31 + + # image formats + .jpg 01;35 +@@ -184,6 +188,19 @@ + .ogv 01;35 + .ogx 01;35 + ++# Text/document files ++.cfg 00;32 ++.conf 00;32 ++.diff 00;32 ++.doc 00;32 ++.ini 00;32 ++.log 00;32 ++.patch 00;32 ++.pdf 00;32 ++.ps 00;32 ++.tex 00;32 ++.txt 00;32 ++ + # audio formats + .aac 00;36 + .au 00;36 diff --git a/source/base/coreutils/DIR_COLORS b/source/base/coreutils/DIR_COLORS deleted file mode 100644 index 974009b..0000000 --- a/source/base/coreutils/DIR_COLORS +++ /dev/null @@ -1,147 +0,0 @@ -# Configuration file for the color ls utility -# This file goes in the /etc directory, and must be world readable. -# You can copy this file to .dir_colors in your $HOME directory to override -# the system defaults. - -# COLOR needs one of these arguments: 'tty' colorizes output to ttys, but not -# pipes. 'all' adds color characters to all output. 'none' shuts colorization -# off. -COLOR tty - -# Extra command line options for ls go here. -# Basically these ones are: -# -F = show '/' for dirs, '*' for executables, etc. -# -T 0 = don't trust tab spacing when formatting ls output. -# -b = better support for special characters -OPTIONS -F -b -T 0 - -# Below, there should be one TERM entry for each termtype that is colorizable -TERM linux -TERM linux-c -TERM console -TERM con132x25 -TERM con132x30 -TERM con132x43 -TERM con132x60 -TERM con80x25 -TERM con80x28 -TERM con80x30 -TERM con80x43 -TERM con80x50 -TERM con80x60 -TERM Eterm -TERM gnome -TERM rxvt -TERM screen -TERM screen-w -TERM xterm -TERM xterm-color -TERM vt100 -TERM vt102 - -# EIGHTBIT, followed by '1' for on, '0' for off. (8-bit output) -EIGHTBIT 1 - -# 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 -FIFO 40;33 # pipe -SOCK 01;35 # socket -BLK 40;33;01 # block device driver -CHR 40;33;01 # character device driver -ORPHAN 40;31;01 # symlink to nonexistent file - -# 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 '#') - -# executables (bright green) -.bat 01;32 -.BAT 01;32 -.btm 01;32 -.BTM 01;32 -.cmd 01;32 -.CMD 01;32 -.com 01;32 -.COM 01;32 -.dll 01;32 -.DLL 01;32 -.exe 01;32 -.EXE 01;32 - -# archives or compressed (bright red) -.arj 01;31 -.bz2 01;31 -.deb 01;31 -.gz 01;31 -.lzh 01;31 -.fpm 01;31 -.rpm 01;31 -.tar 01;31 -.taz 01;31 -.tb2 01;31 -.tbz2 01;31 -.tbz 01;31 -.tgz 01;31 -.tz2 01;31 -.z 01;31 -.Z 01;31 -.zip 01;31 -.ZIP 01;31 -.zoo 01;31 - -# multimedia (video/image/sound) file formats -.asf 01;35 -.ASF 01;35 -.avi 01;35 -.AVI 01;35 -.bmp 01;35 -.BMP 01;35 -.flac 01;35 -.FLAC 01;35 -.gif 01;35 -.GIF 01;35 -.jpg 01;35 -.JPG 01;35 -.jpeg 01;35 -.JPEG 01;35 -.m2a 01;35 -.M2a 01;35 -.m2v 01;35 -.M2V 01;35 -.mov 01;35 -.MOV 01;35 -.mp3 01;35 -.MP3 01;35 -.mpeg 01;35 -.MPEG 01;35 -.mpg 01;35 -.MPG 01;35 -.ogg 01;35 -.OGG 01;35 -.ppm 01;35 -.rm 01;35 -.RM 01;35 -.tga 01;35 -.TGA 01;35 -.tif 01;35 -.TIF 01;35 -.wav 01;35 -.WAV 01;35 -.wmv 01;35 -.WMV 01;35 -.xbm 01;35 -.xpm 01;35 diff --git a/source/base/coreutils/FrugalBuild b/source/base/coreutils/FrugalBuild index 1be0215..40c5725 100644 --- a/source/base/coreutils/FrugalBuild +++ b/source/base/coreutils/FrugalBuild @@ -4,27 +4,22 @@ pkgname=coreutils pkgver=8.29 -pkgrel=1 +pkgrel=2 pkgdesc="These are the GNU core utilities, the basic command line programs" url="http://www.gnu.org/software/coreutils"; -depends=('bash>=4.3_042-5' 'glibc>=2.25-5' 'gmp>=6.1.2-2' 'libcap>=2.25-7' 'xfsprogs-acl>=2.2.52-6') +depends=('bash>=4.3_042-5' 'glibc>=2.25-5' 'xfsprogs-attr' 'gmp>=6.1.2-2' 'libcap>=2.25-7' 'xfsprogs-acl>=2.2.52-6') groups=('base' 'core' 'chroot-core') archs=('x86_64') Fup2gnugz -source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz \ - DIR_COLORS \ - newbie-aliases.sh \ - dircolors.sh dircolors.c \ - dircolors.h dircolors.1 \ - dc-ls-fix.patch no-dircolors-man.patch \ - coreutils-8.2-uname-processortype.patch ) -signatures=(${source[0]}.sig '' '' '' '' '' '' '' '' '') +source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz + newbie-aliases.sh dircolors.sh + 003_all_coreutils-gentoo-uname.patch + 030_all_coreutils-more-dir-colors.patch) +signatures=(${source[0]}.sig '' '' '' '') build() { Fcd - Fexec cp -f -v $Fsrcdir/dircolors.{c,h} src/ - Fexec rm -v -rf man/dircolors.* ## broken Fpatchall Fautoreconf @@ -38,11 +33,9 @@ build() --enable-install-program=arch \ ac_cv_func_openat=no - Fsed "man/dircolors.1" "" Makefile Fmakeinstall - Ffile /etc/DIR_COLORS - Ffile /usr/share/man/man1/dircolors.1 + Ffilerel src/dircolors.hin /etc/DIR_COLORS # compat symlinks Fmkdir /usr/{bin,sbin} Fln install /usr/bin/ginstall diff --git a/source/base/coreutils/coreutils-8.2-uname-processortype.patch b/source/base/coreutils/coreutils-8.2-uname-processortype.patch deleted file mode 100644 index 4c83df8..0000000 --- a/source/base/coreutils/coreutils-8.2-uname-processortype.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff -urNp coreutils-8.2-orig/src/uname.c coreutils-8.2/src/uname.c ---- coreutils-8.2-orig/src/uname.c 2009-09-23 10:25:44.000000000 +0200 -+++ coreutils-8.2/src/uname.c 2009-12-19 09:09:11.663607110 +0100 -@@ -301,7 +301,7 @@ main (int argc, char **argv) - - if (toprint & PRINT_PROCESSOR) - { -- char const *element = unknown; -+ char *element = unknown; - #if HAVE_SYSINFO && defined SI_ARCHITECTURE - { - static char processor[257]; -@@ -308,6 +308,12 @@ main (int argc, char **argv) - if (0 <= sysinfo (SI_ARCHITECTURE, processor, sizeof processor)) - element = processor; - } -+#else -+ { -+ static struct utsname u; -+ uname(&u); -+ element = u.machine; -+ } - #endif - #ifdef UNAME_PROCESSOR - if (element == unknown) -@@ -351,7 +357,7 @@ main (int argc, char **argv) - - if (toprint & PRINT_HARDWARE_PLATFORM) - { -- char const *element = unknown; -+ char *element = unknown; - #if HAVE_SYSINFO && defined SI_PLATFORM - { - static char hardware_platform[257]; -@@ -353,6 +359,14 @@ main (int argc, char **argv) - hardware_platform, sizeof hardware_platform)) - element = hardware_platform; - } -+#else -+ { -+ static struct utsname u; -+ uname(&u); -+ element = u.machine; -+ if(strlen(element)==4 && element[0]=='i' && element[2]=='8' && element[3]=='6') -+ element[1]='3'; -+ } - #endif - #ifdef UNAME_HARDWARE_PLATFORM - if (element == unknown) diff --git a/source/base/coreutils/dc-ls-fix.patch b/source/base/coreutils/dc-ls-fix.patch deleted file mode 100644 index 982a6db..0000000 --- a/source/base/coreutils/dc-ls-fix.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur coreutils-8.24/src/ls.c coreutils-8.24-ls/src/ls.c ---- coreutils-8.24/src/ls.c 2015-06-26 19:05:22.000000000 +0200 -+++ coreutils-8.24-ls/src/ls.c 2015-10-04 17:50:44.743178376 +0200 -@@ -2315,8 +2315,8 @@ - if (! term || ! *term) - return false; - -- char const *line = G_line; -- while (line - G_line < sizeof (G_line)) -+ char const *line = (char const *)G_line; -+ while (line - (char const *)G_line < sizeof (G_line)) - { - if (STRNCMP_LIT (line, "TERM ") == 0) - { diff --git a/source/base/coreutils/dircolors.1 b/source/base/coreutils/dircolors.1 deleted file mode 100644 index a286f18..0000000 --- a/source/base/coreutils/dircolors.1 +++ /dev/null @@ -1,399 +0,0 @@ -.TH DIRCOLORS 1L \" -*- nroff -*- -.SH NAME -dircolors \- Set color parameters for -.BR ls (1) -.SH SYNOPSIS -.TP -\fBeval `dircolors\fR [\-abckstzPS] [filename]\fB`\fR -.TP -.B dircolors \-v -.SH DESCRIPTION -.B dircolors -is a program to generate a setup for the color version of GNU -.BR ls . -The setup consists of an -.B LS_COLORS -environment variable and a set of aliases. For -.B sh -and -.BR ash , -which lack aliases, shell functions are substituted. The -.B dircolors -command will generally be run from the user's -.IR .profile , -.I .cshrc -or equivalent file, or the system-wide equivalents. -.SS OPTIONS -.TP -.I "\-a, \-s" -Assume the user is using a Bourne-style shell which does not support -aliasing. This is default if the base name of the environment -variable -.B SHELL -is -.B sh -or -.BR ash . -Instead a shell function is used. If the -.I \-P -option is also used, this function will need to spawn a subshell; this -is slow and should be avoided if possible. -.TP -.I "\-b, \-k" -Assume the user is using a Bourne-style shell that supports Korn-style -aliasing. This is the default if the base name of the environment -variable -.B SHELL -is -.B bash -or -.BR ksh . -You may want to specify this option explicitly if your -.B sh -is really a more advanced shell, which does support Korn-style aliasing. -.TP -.I "\-z" -Assume the user is using a Bourne-style shell that supports Korn-style -aliasing, but differs between string and list environment variables. -This is the default is the base name of the environment variable -.B SHELL -is -.BR zsh . -.TP -.I "\-c, \-t" -Assume the user is using a C-style shell. This is the default if the -base name of the environment variable -.B SHELL -is -.B csh -or -.BR tcsh . -.TP -.I "\-P" -Do not seek the path to find the location of the -.B ls -binary. By default, -.B dircolors -will find the location of the -.B ls -binary at the time it is run, and include it in the shell function or -alias, which for most shells results in a significant speed -improvement. -.TP -.I "\-S" -Set colorization to -.I no -if the terminal does not occur in any -.B TERM -statement, even if there is a -.B COLOR -statement in the global section of the file. This is for -compatibility with Slackware GNU -.B ls -for which the order of the statements did not matter. -.TP -.I "\-v" -Display a version string and exit. -.SS CONFIGURATION FILE -If a filename is specified on the command line, it will be used to -generate the setup, if not, the file -.B .dir_colors -in the users home directory will be used. If that file does not exist -either, the system-wide file of -.B /etc/DIR_COLORS -will be used. -.PP -The configuration file consists of several statements, one per line. -Anything right of a hash mark (\#) is treated as a comment, if the -hash mark is at the beginning of a line or is preceded by at least one -whitespace. Blank lines are ignored. -.PP -The -.I global -section of the file consists of any statement before the first -.B TERM -statement. Any statement in the global section of the file is -considered valid for all terminal types Following the global section -is one or more -.I terminal-specific -sections, which are preceded by one or more -.B TERM -statements which specify the terminal types (as given by the -.B TERM -environment variable) the following declarations apply for. It is -always possible to override a global declaration by a subsequent -terminal-specific one. -.PP -The following statements are recognized, case is insignificant: -.PP -.TP -.B TERM \fIterminal-type\fR -Starts a terminal-specific section and specifies which terminal it -applies to. Multiple -.B TERM -statements can be used to create a section which applies for several -terminal types. -.TP -.B COLOR yes|all|no|none|tty -Specifies that colorization should be always enabled (\fIyes\fR or -\fIall\fR), never enabled (\fIno\fR or \fInone\fR) or enabled only if -the output is a terminal (\fItty\fR). The default is \fIno\fR. -.TP -.B OPTIONS \fIoptions\fR -Adds command line options to the default -.B ls -command line. The options can be any valid -.B ls -command line options, and should include the leading minus sign. -Please note that -.B dircolors -does not verify the validity of these options. -.TP -.B NORMAL \fIcolor-sequence\fR -Specifies the color used for normal (non-filename) text. -.TP -.B FILE \fIcolor-sequence\fR -Specifies the color used for a regular file. -.TP -.B DIR \fIcolor-sequence\fR -Specifies the color used for directories. -.TP -.B LINK \fIcolor-sequence\fR -Specifies the color used for a symbolic link. -.TP -.B ORPHAN \fIcolor-sequence\fR -Specifies the color used for an orphanned symbolic link (one which -points to a nonexistent file). If this is unspecified, -.B ls -will use the -.B LINK -color instead. -.TP -.B MISSING \fIcolor-sequence\fR -Specifies the color used for a missing file (a nonexistent file which -nevertheless has a symbolic link pointing to it). If this is unspecified, -.B ls -will use the -.B FILE -color instead. -.TP -.B FIFO \fIcolor-sequence\fR -Specifies the color used for a FIFO (named pipe). -.TP -.B SOCK \fIcolor-sequence\fR -Specifies the color used for a socket. -.TP -.B BLK \fIcolor-sequence\fR -Specifies the color used for a block device special file. -.TP -.B CHR \fIcolor-sequence\fR -Specifies the color used for a character device special file. -.TP -.B EXEC \fIcolor-sequence\fR -Specifies the color used for a file with the executable attribute set. -.TP -.B LEFTCODE \fIcolor-sequence\fR -Specifies the -.I "left code" -for non-ISO\ 6429 terminals (see below). -.TP -.B RIGHTCODE \fIcolor-sequence\fR -Specifies the -.I "right code" -for non-ISO\ 6429 terminals (see below). -.TP -.B ENDCODE \fIcolor-sequence\fR -Specifies the -.I "end code" -for non-ISO\ 6429 terminals (see below). -.TP -\fB*\fIextension\fR \fIcolor-sequence\fR -Specifies the color used for any file that ends in \fIextension\fR. -.TP -\fB .\fIextension\fR \fIcolor-sequence\fR -Same as \fB*\fR.\fIextension\fR. Specifies the color used for any file that -ends in .\fIextension\fR. Note that the period is included in the -extension, which makes it impossible to specify an extension not -starting with a period, such as -.B ~ -for -.B emacs -backup files. This form should be considered obsolete. -.SH ISO 6429 (ANSI) COLOR SEQUENCES -Most color-capable ASCII terminals today use ISO 6429 (ANSI) color sequences, -and many common terminals without color capability, including -.B xterm -and the widely used and cloned DEC VT100, will recognize ISO 6429 color -codes and harmlessly eliminate them from the output or emulate them. -.B ls -uses ISO 6429 codes by default, assuming colorization is enabled. - -ISO 6429 color sequences are composed of sequences of numbers -separated by semicolons. The most common codes are: -.sp -.RS +.2i -.ta 1.0i -.nf - 0 to restore default color - 1 for brighter colors - 4 for underlined text - 5 for flashing text -30 for black foreground -31 for red foreground -32 for green foreground -33 for yellow (or brown) foreground -34 for blue foreground -35 for purple foreground -36 for cyan foreground -37 for white (or gray) foreground -40 for black background -41 for red background -42 for green background -43 for yellow (or brown) background -44 for blue background -45 for purple background -46 for cyan background -47 for white (or gray) background -.fi -.RE -.sp -Not all commands will work on all systems or display devices. -.PP -.B ls -uses the following defaults: -.sp -.RS +.2i -.ta 1.0i 2.5i -.nf -\fBNORMAL\fR 0 Normal (non-filename) text -\fBFILE\fR 0 Regular file -\fBDIR\fR 32 Directory -\fBLINK\fR 36 Symbolic link -\fBORPHAN\fR undefined Orphanned symbolic link -\fBMISSING\fR undefined Missing file -\fBFIFO\fR 31 Named pipe (FIFO) -\fBSOCK\fR 33 Socket -\fBBLK\fR 44;37 Block device -\fBCHR\fR 44;37 Character device -\fBEXEC\fR 35 Executable file -.fi -.RE -.sp -A few terminal programs do not recognize the default -properly. If all text gets colorized after you do a directory -listing, change the -.B NORMAL -and -.B FILE -codes to the numerical codes for your normal foreground and background -colors. -.SH OTHER TERMINAL TYPES (ADVANCED CONFIGURATION) -If you have a color-capable (or otherwise highlighting) terminal (or -printer!) which uses a different set of codes, you can still generate -a suitable setup. To do so you will have to use the -.BR LEFTCODE , -.BR RIGHTCODE , -and -.BR ENDCODE -definitions. -.PP -When writing out a filename, -.B ls -generates the following output sequence: -.B LEFTCODE -.I typecode -.B RIGHTCODE -.I filename -.BR ENDCODE , -where the -.I typecode -is the color sequence that depends on the type or name of file. If the -.B ENDCODE -is undefined, the sequence -.B "LEFTCODE NORMAL RIGHTCODE" -will be used instead. The purpose of the left- and rightcodes is -merely to reduce the amount of typing necessary (and to hide ugly -escape codes away from the user). If they are not appropriate for -your terminal, you can eliminate them by specifying the respective -keyword on a line by itself. -.PP -.B NOTE: -If the -.B ENDCODE -is defined in the global section of the setup file, it -.I cannot -be undefined in a terminal-specific section of the file. This means -any -.B NORMAL -definition will have no effect. A different -.B ENDCODE -can however be specified, which would have the same effect. -.SH ESCAPE SEQUENCES -To specify control- or blank characters in the color sequences or -filename extensions, either C-style \e-escaped notation, or -.BR stty -style -^-notation can be used. The C-style notation -includes the following characters: -.sp -.RS +.2i -.ta 1.0i -.nf -\fB\ea\fR Bell (ASCII 7) -\fB\eb\fR Backspace (ASCII 8) -\fB\ee\fR Escape (ASCII 27) -\fB\ef\fR Form feed (ASCII 12) -\fB\en\fR Newline (ASCII 10) -\fB\er\fR Carriage Return (ASCII 13) -\fB\et\fR Tab (ASCII 9) -\fB\ev\fR Vertical Tab (ASCII 11) -\fB\e?\fR Delete (ASCII 127) -\fB\e\fInnn\fR Any character (octal notation) -\fB\ex\fInnn\fR Any character (hexadecimal notation) -\fB\e_\fR Space -\fB\e\e\fR Backslash (\e) -\fB\e^\fR Caret (^) -\fB\e#\fR Hash mark (#) -.fi -.RE -.sp -Please note that escapes are necessary to enter a space, backslash, -caret or any control character anywhere in the string, as well as a -hash mark as the first character. -.SH NOTES -The default -.B LEFTCODE -and -.B RIGHTCODE -definitions, which are used by ISO 6429 terminals are: -.sp -.RS +.2i -.ta 1.0i -.nf -\fBLEFTCODE\fR \ee[ -\fBRIGHTCODE\fR m -.fi -.RE -.sp -The default -.B ENDCODE -is undefined. -.SH AUTHOR -H. Peter Anvin <[email protected]> with input from Patrick -Volkerding, creator of the Slackware Linux distribution. -.SH BUGS -Currently is somewhat poorly integrated into the GNU fileutils -package. For example, it does not support long options and is -probably pickier about POSIX violations (i.e. less portable) -than the rest of the programs. -.PP -The support for non-ISO 6429 terminals is a kluge at the very best. -.SH FILES -.ta \w'/etc/DIR_COLORS'u+3n -.nf -\fB/etc/DIR_COLORS\fR System-wide setup file -\fB~/.dir_colors\fR User setup file -.fi -.SH SEE ALSO -.BR ls (1), -.BR stty (1), -.BR xterm (1) diff --git a/source/base/coreutils/dircolors.c b/source/base/coreutils/dircolors.c deleted file mode 100644 index 43bc162..0000000 --- a/source/base/coreutils/dircolors.c +++ /dev/null @@ -1,570 +0,0 @@ -/* - dircolors.c - - Parse a Slackware-style DIR_COLORS file - - Copyright (C) 1994, 1995 H. Peter Anvin - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ - - -#include <config.h> - -#include <sys/types.h> -#include <getopt.h> - -#include <stdio.h> -#include <stdlib.h> -#include <unistd.h> -#include <ctype.h> -#include <string.h> - -#include "config.h" -#include "dircolors.h" - - -#define ETC_DIR "/etc" -#define USER_FILE ".dir_colors" /* Versus user's home directory */ -#define SYSTEM_FILE "/DIR_COLORS" /* System-wide file in directory SYSTEM_DIR - (defined on the cc command line) */ - -#define STRINGLEN 2048 /* Max length of a string */ - -enum modes { mo_sh, mo_csh, mo_ksh, mo_zsh, mo_unknown, mo_err }; - -const char *shells[] = { "sh", "ash", "csh", "tcsh", "bash", "ksh", - "zsh", NULL }; - -const int shell_mode[] = { mo_sh, mo_sh, mo_csh, mo_csh, - mo_ksh, mo_ksh, mo_zsh }; - -static int -figure_mode (me) - char *me; -{ - char *shell, *shellv; - int i; - - shellv = getenv("SHELL"); - if ( !shellv || !(*shellv) ) - { - fprintf(stderr, "%s: No SHELL variable, and no mode option specified\n", - me); - return mo_err; - } - - if ( (shell = strrchr(shellv,'/')) != NULL ) - shell++; - else - shell = shellv; - - for ( i = 0 ; shells[i] ; i++ ) - { - if ( strcmp(shell,shells[i]) == 0 ) - return shell_mode[i]; - } - - fprintf(stderr, "%s: Unknown shell `%s'\n", me, shell); - return mo_err; -} - -static void -parse_line(char **keyword, char **arg, char *line) -{ - char *p; - - *keyword = *arg = ""; - - for ( p = line ; isspace(*p) ; p++ ); - - if ( ! (*p) || *p == '#' ) - return; - - *keyword = p; - - for ( ; !isspace(*p) ; p++ ) - { - if ( !(*p) ) - return; - } - - *(p++) = '\0'; - - for ( ; isspace(*p) ; p++ ); - - if ( ! (*p) || *p == '#' ) - return; - - *arg = p; - - for ( ; *p != '\0' && *p != '#' ; p++ ); - for ( p-- ; isspace(*p) ; p-- ); - p++; - - *p = '\0'; - - return; -} - -/* Write a string to standard out, while watching for "dangerous" - sequences like unescaped : and = characters */ - -static void -put_seq(str, follow) - char *str; - char follow; -{ - int danger = 1; - - for ( ; *str ; str++ ) - { - switch ( *str ) - { - case '\\': - case '^': - danger = !danger; - break; - - case ':': - case '=': - if ( danger ) - putchar('\\'); - /* Fall through */ - - default: - danger = 1; - break; - } - - putchar( *str ); - } - - putchar(follow); /* The character that ends the sequence */ -} - -/* Parser needs these state variables */ -enum states { st_termno, st_termyes, st_termsure, st_global }; - -const char *slack_codes[] = {"NORMAL", "NORM", "FILE", "DIR", "LNK", "LINK", -"SYMLINK", "ORPHAN", "MISSING", "FIFO", "PIPE", "SOCK", "BLK", "BLOCK", -"CHR", "CHAR", "EXEC", "LEFT", "LEFTCODE", "RIGHT", "RIGHTCODE", "END", -"ENDCODE", NULL}; - -const char *ls_codes[] = {"no", "no", "fi", "di", "ln", "ln", "ln", -"or", "mi", "pi", "pi", "so", "bd", "bd", "cd", "cd", "ex", "lc", "lc", "rc", -"rc", "ec", "ec"}; - -enum color_opts { col_yes, col_no, col_tty }; - -int -main (argc, argv) - int argc; - char *argv[]; -{ - char *p, *q; - char *file = NULL; - int i; - int mode = mo_unknown; - FILE *fp = NULL; - char *term; - int state; - - char line[STRINGLEN]; - char useropts[2048] = ""; - char *keywd, *arg; - - int eightbit = 1; /* Default to 8-bit */ - int color_opt = col_no; /* Assume --color=no */ - - int strict_slack = 0; /* Strict Slackware compatibility */ - int no_path = 0; /* Do not search PATH */ - - char *copt, *bopt; - - /* Parse command line */ - - for ( i = 1 ; i < argc ; i++ ) - { - if ( argv[i][0] == '-' ) - { - for ( p = &argv[i][1] ; *p ; p++ ) - { - switch ( *p ) - { - case 'a': - case 's': /* Plain sh mode */ - mode = mo_sh; - break; - - case 'c': - case 't': - mode = mo_csh; - break; - - case 'b': - case 'k': - mode = mo_ksh; - break; - - case 'z': - mode = mo_zsh; - break; - - case 'P': - no_path = 1; - break; - - case 'S': - strict_slack = 1; - eightbit = 0; /* Default to 7-bit */ - break; - - case 'v': - printf("For %s with color-ls patch %s\n", - "fileutils-3.16", "3.12.0.3"); - exit(0); - - default: - fprintf(stderr, "%s: Unknown option -%c\n", argv[0], *p); - exit(1); - } - } - } - else - file = argv[i]; - } - - /* Use shell to determine mode, if not already done. */ - - if ( mode == mo_unknown ) - { - mode = figure_mode(argv[0]); - if ( mode == mo_err ) - exit(1); - } - - /* Open dir_colors file */ - - if ( !file ) - { - p = getenv("HOME"); - if ( p && *p ) - { - chdir(p); - fp = fopen(USER_FILE, "r"); - } - - if ( !fp ) - fp = fopen(ETC_DIR SYSTEM_FILE, "r"); - } - else - fp = fopen(file, "r"); - - if ( !fp ) - { - perror(argv[0]); - exit(1); - } - - /* Get terminal type */ - - term = getenv("TERM"); - if ( !term || !(*term) ) - term = "none"; - - /* Write out common start */ - - switch ( mode ) - { - case mo_csh: - printf("set noglob;\n\ -setenv LS_COLORS \':"); - break; - case mo_sh: - case mo_ksh: - case mo_zsh: - printf("LS_COLORS=\'"); - break; - } - - /* Start parsing that sucker */ - - state = st_global; - - while ( fgets(line,STRINGLEN,fp) != NULL ) - { - parse_line(&keywd, &arg, line); - if ( *keywd ) - { - if ( strcasecmp(keywd, "TERM") == 0 ) - { - if ( strcmp(arg, term) == 0 ) - { - state = st_termsure; - strict_slack = 0; /* We've fulfilled the requirement */ - } - else if ( state != st_termsure ) - state = st_termno; - } - else - { - if ( state == st_termsure ) - state = st_termyes; /* Another TERM can cancel */ - - if ( state != st_termno ) - { - if ( keywd[0] == '.' ) - { - putchar('*'); - put_seq(keywd,'='); - put_seq(arg,':'); - } - else if ( keywd[0] == '*' ) - { - put_seq(keywd,'='); - put_seq(arg,':'); - } - else if ( strcasecmp(keywd, "OPTIONS") == 0 ) - { - strcat(useropts, " "); - strcat(useropts, arg); - } - else if ( strcasecmp(keywd, "COLOR") == 0 ) - { - switch ( arg[0] ) - { - case 'a': - case 'y': - case '1': - color_opt = col_yes; - break; - - case 'n': - case '0': - color_opt = col_no; - break; - - case 't': - color_opt = col_tty; - break; - - default: - fprintf(stderr, "%s: Unknown COLOR option `%s'\n", - argv[0], arg); - break; - } - } - else if ( strcasecmp(keywd, "EIGHTBIT") == 0 ) - { - switch( arg[0] ) - { - case 'y': - case '1': - eightbit = 1; - break; - - case 'n': - case '0': - eightbit = 0; - break; - - default: - fprintf(stderr, "%s: Unknown EIGHTBIT option `%s'\n", - argv[0], arg); - break; - } - } - else - { - for ( i = 0 ; slack_codes[i] ; i++ ) - { - if ( strcasecmp(keywd, slack_codes[i]) == 0 ) - break; - } - - if ( slack_codes[i] ) - { - printf("%s=", ls_codes[i]); - put_seq(arg,':'); - } - else - fprintf(stderr, "%s: Unknown keyword %s\n", - argv[0], keywd); - } - } - } - } - } - - fclose(fp); - - /* If strict_slack is still set, we force COLOR to no */ - - if ( strict_slack ) - color_opt = col_no; - - /* Decide on the options */ - - switch ( color_opt ) - { - case col_yes: - copt = "--color=always"; - break; - - case col_no: - copt = "--color=never"; - break; - - case col_tty: - copt = "--color=auto"; - break; - } - - /* bopt = eightbit ? "--8bit" : "--7bit"; */ - bopt = ""; /* obsolete; cruft */ - - /* Find ls in the path */ - - if ( !no_path ) - { - no_path = 1; /* Assume we won't find one */ - - p = getenv("PATH"); - if ( p && *p ) - { - while ( *p ) - { - while ( *p == ':' ) - p++; - - if ( *p != '/' ) /* Skip relative path entries */ - while ( *p && *p != ':' ) - p++; - else - { - q = line; - while ( *p && *p != ':' ) - *(q++) = *(p++); - /* Make sure it ends in slash */ - if ( *(q-1) != '/' ) - *(q++) = '/'; - - strcpy(q, "ls"); - if ( access(line, X_OK) == 0 ) - { - no_path = 0; /* Found it */ - break; - } - } - } - } - } - - /* Write it out */ - - switch ( mode ) - { - case mo_sh: - if ( no_path ) - printf("\';\n\ -export LS_COLORS;\n\ -LS_OPTIONS='%s %s%s';\n\ -export LS_OPTIONS;\n\ -ls () { ( exec ls $LS_OPTIONS \"$@\" ) };\n\ -dir () { ( exec dir $LS_OPTIONS \"$@\" ) };\n\ -vdir () { ( exec vdir $LS_OPTIONS \"$@\" ) };\n\ -d () { dir \"$@\" ; };\n\ -v () { vdir \"$@\" ; };\n", bopt, copt, useropts); - else - printf("\';\n\ -export LS_COLORS;\n\ -LS_OPTIONS='%s %s%s';\n\ -ls () { %s $LS_OPTIONS \"$@\" ; };\n\ -dir () { %s $LS_OPTIONS --format=vertical \"$@\" ; };\n\ -vdir () { %s $LS_OPTIONS --format=long \"$@\" ; };\n\ -d () { dir \"$@\" ; };\n\ -v () { vdir \"$@\" ; };\n", bopt, copt, useropts, line, line, line); - break; - - case mo_csh: - if ( no_path ) - printf("\';\n\ -setenv LS_OPTIONS '%s %s%s';\n\ -alias ls \'ls $LS_OPTIONS\';\n\ -alias dir \'dir $LS_OPTIONS\';\n\ -alias vdir \'vdir $LS_OPTIONS\';\n\ -alias d dir;\n\ -alias v vdir;\n\ -unset noglob;\n", bopt, copt, useropts); - else - printf("\';\n\ -setenv LS_OPTIONS '%s %s%s';\n\ -alias ls \'%s $LS_OPTIONS\';\n\ -alias dir \'%s $LS_OPTIONS --format=vertical\';\n\ -alias vdir \'%s $LS_OPTIONS --format=long\';\n\ -alias d dir;\n\ -alias v vdir;\n\ -unset noglob;\n", bopt, copt, useropts, line, line, line); - break; - - case mo_ksh: - if ( no_path ) - printf("\';\n\ -export LS_COLORS;\n\ -LS_OPTIONS='%s %s%s';\n\ -export LS_OPTIONS;\n\ -alias ls=\'ls $LS_OPTIONS\';\n\ -alias dir=\'dir $LS_OPTIONS\';\n\ -alias vdir=\'vdir $LS_OPTIONS\';\n\ -alias d=dir;\n\ -alias v=vdir;\n", bopt, copt, useropts); - else - printf("\';\n\ -export LS_COLORS;\n\ -LS_OPTIONS='%s %s%s';\n\ -export LS_OPTIONS;\n\ -alias ls=\'%s $LS_OPTIONS\';\n\ -alias dir=\'%s $LS_OPTIONS --format=vertical\';\n\ -alias vdir=\'%s $LS_OPTIONS --format=long\';\n\ -alias d=dir;\n\ -alias v=vdir;\n", bopt, copt, useropts, line, line, line); - break; - - case mo_zsh: - if ( no_path ) - printf("\';\n\ -export LS_COLORS;\n\ -LS_OPTIONS=(%s %s%s);\n\ -export LS_OPTIONS;\n\ -alias ls=\'ls $LS_OPTIONS\';\n\ -alias dir=\'dir $LS_OPTIONS\';\n\ -alias vdir=\'vdir $LS_OPTIONS\';\n\ -alias d=dir;\n\ -alias v=vdir;\n", bopt, copt, useropts); - else - printf("\';\n\ -export LS_COLORS;\n\ -LS_OPTIONS=(%s %s%s);\n\ -export LS_OPTIONS;\n\ -alias ls=\'%s $LS_OPTIONS\';\n\ -alias dir=\'%s $LS_OPTIONS --format=vertical\';\n\ -alias vdir=\'%s $LS_OPTIONS --format=long\';\n\ -alias d=dir;\n\ -alias v=vdir;\n", bopt, copt, useropts, line, line, line); - break; - } - - exit(0); -} diff --git a/source/base/coreutils/dircolors.h b/source/base/coreutils/dircolors.h deleted file mode 100644 index e1a50be..0000000 --- a/source/base/coreutils/dircolors.h +++ /dev/null @@ -1,105 +0,0 @@ -#define G_N_LINES 91 - -const size_t G_line_length[G_N_LINES] = -{ - 65, 72, 0, 59, 61, 0, 77, 10, 12, 15, 12, 14, 14, 14, 14, 13, 13, 13, 13, - 13, 13, 10, 17, 9, 11, 13, 10, 0, 73, 64, 18, 64, 19, 72, 25, 72, 68, - 22, 22, 71, 72, 17, 19, 17, 34, 39, 45, 0, 44, 10, 0, 70, 75, 48, 0, - 73, 40, 11, 11, 11, 11, 0, 48, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 0, 15, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 9, 9 -}; - -const char *const G_line[G_N_LINES] = -{ - "# Configuration file for dircolors, a utility to help you set the", - "# LS_COLORS environment variable used by GNU ls with the --color option.", - "", - "# 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 linux", - "TERM linux-c", - "TERM mach-color", - "TERM console", - "TERM con132x25", - "TERM con132x30", - "TERM con132x43", - "TERM con132x60", - "TERM con80x25", - "TERM con80x28", - "TERM con80x30", - "TERM con80x43", - "TERM con80x50", - "TERM con80x60", - "TERM xterm", - "TERM xterm-debian", - "TERM rxvt", - "TERM screen", - "TERM screen-w", - "TERM vt100", - "", - "# 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", - "", - "# 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", - "", - ".tar 01;31 # archives or compressed (bright red)", - ".tgz 01;31", - ".arj 01;31", - ".taz 01;31", - ".lzh 01;31", - ".zip 01;31", - ".z 01;31", - ".Z 01;31", - ".gz 01;31", - ".bz2 01;31", - ".deb 01;31", - ".rpm 01;31", - "", - "# image formats", - ".jpg 01;35", - ".png 01;35", - ".gif 01;35", - ".bmp 01;35", - ".ppm 01;35", - ".tga 01;35", - ".xbm 01;35", - ".xpm 01;35", - ".tif 01;35", - ".png 01;35", - ".mpg 01;35", - ".avi 01;35", - ".fli 01;35", - ".gl 01;35", - ".dl 01;35" -}; diff --git a/source/base/coreutils/newbie-aliases.sh b/source/base/coreutils/newbie-aliases.sh index 342712f..32e3c8e 100644 --- a/source/base/coreutils/newbie-aliases.sh +++ b/source/base/coreutils/newbie-aliases.sh @@ -2,3 +2,5 @@ alias rm='rm -i' alias cp='cp -i' alias mv='mv -i' +alias ls="ls --color=auto" +alias grep="grep --color=auto" diff --git a/source/base/coreutils/no-dircolors-man.patch b/source/base/coreutils/no-dircolors-man.patch deleted file mode 100644 index dfc1f7e..0000000 --- a/source/base/coreutils/no-dircolors-man.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -Naur coreutils-8.24/Makefile.in coreutils-8.24-man/Makefile.in ---- coreutils-8.24/Makefile.in 2015-07-03 23:23:13.000000000 +0200 -+++ coreutils-8.24-man/Makefile.in 2015-10-04 18:44:35.345124319 +0200 -@@ -14156,7 +14156,6 @@ - @SINGLE_BINARY_FALSE@man/dd.1: src/dd$(EXEEXT) - @SINGLE_BINARY_FALSE@man/df.1: src/df$(EXEEXT) - @SINGLE_BINARY_FALSE@man/dir.1: src/dir$(EXEEXT) --@SINGLE_BINARY_FALSE@man/dircolors.1: src/dircolors$(EXEEXT) - @SINGLE_BINARY_FALSE@man/dirname.1: src/dirname$(EXEEXT) - @SINGLE_BINARY_FALSE@man/du.1: src/du$(EXEEXT) - @SINGLE_BINARY_FALSE@man/echo.1: src/echo$(EXEEXT) -diff -Naur coreutils-8.24/man/local.mk coreutils-8.24-man/man/local.mk ---- coreutils-8.24/man/local.mk 2015-06-26 19:04:19.000000000 +0200 -+++ coreutils-8.24-man/man/local.mk 2015-10-04 18:45:24.043373074 +0200 -@@ -78,7 +78,6 @@ - man/dd.1: src/dd$(EXEEXT) - man/df.1: src/df$(EXEEXT) - man/dir.1: src/dir$(EXEEXT) --man/dircolors.1: src/dircolors$(EXEEXT) - man/dirname.1: src/dirname$(EXEEXT) - man/du.1: src/du$(EXEEXT) - man/echo.1: src/echo$(EXEEXT) _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
