Move colorfiles to folder

2017-02-28 11:29:50 -06:00 · 2017-02-28 11:29:50 -06:00 · 96073d8766
parent ff14ccb730
commit 96073d8766
68 changed files with 4 additions and 8 deletions
--- a/2
+++ b/2
@ -16,7 +16,7 @@ If you have a debian system with all necessary packages installed, type

 else:

-	1) copy conf.* files into /usr/share/grc/ or /usr/local/share/grc/,
+	1) copy colorfiles/conf.* files into /usr/share/grc/ or /usr/local/share/grc/,
 	   creating directories when needed

 	2) copy grc.conf into /etc/
--- a/colorfiles/conf.ant
+++ b/colorfiles/conf.ant
--- a/colorfiles/conf.blkid
+++ b/colorfiles/conf.blkid
--- a/colorfiles/conf.configure
+++ b/colorfiles/conf.configure
--- a/colorfiles/conf.cvs
+++ b/colorfiles/conf.cvs
--- a/colorfiles/conf.df
+++ b/colorfiles/conf.df
--- a/colorfiles/conf.diff
+++ b/colorfiles/conf.diff
--- a/colorfiles/conf.dig
+++ b/colorfiles/conf.dig
--- a/colorfiles/conf.dnf
+++ b/colorfiles/conf.dnf
--- a/colorfiles/conf.docker-machinels
+++ b/colorfiles/conf.docker-machinels
--- a/colorfiles/conf.dockerimages
+++ b/colorfiles/conf.dockerimages
--- a/colorfiles/conf.dockerinfo
+++ b/colorfiles/conf.dockerinfo
--- a/colorfiles/conf.dockernetwork
+++ b/colorfiles/conf.dockernetwork
--- a/colorfiles/conf.dockerps
+++ b/colorfiles/conf.dockerps
--- a/colorfiles/conf.dockerpull
+++ b/colorfiles/conf.dockerpull
--- a/colorfiles/conf.dockersearch
+++ b/colorfiles/conf.dockersearch
--- a/colorfiles/conf.dockerversion
+++ b/colorfiles/conf.dockerversion
--- a/colorfiles/conf.du
+++ b/colorfiles/conf.du
--- a/colorfiles/conf.env
+++ b/colorfiles/conf.env
--- a/colorfiles/conf.esperanto
+++ b/colorfiles/conf.esperanto
--- a/colorfiles/conf.free
+++ b/colorfiles/conf.free
--- a/colorfiles/conf.gcc
+++ b/colorfiles/conf.gcc
--- a/colorfiles/conf.getfacl
+++ b/colorfiles/conf.getfacl
--- a/colorfiles/conf.getsebool
+++ b/colorfiles/conf.getsebool
--- a/colorfiles/conf.ifconfig
+++ b/colorfiles/conf.ifconfig
--- a/colorfiles/conf.iostat_sar
+++ b/colorfiles/conf.iostat_sar
--- a/colorfiles/conf.ip
+++ b/colorfiles/conf.ip
--- a/colorfiles/conf.ipaddr
+++ b/colorfiles/conf.ipaddr
--- a/colorfiles/conf.ipneighbor
+++ b/colorfiles/conf.ipneighbor
--- a/colorfiles/conf.iproute
+++ b/colorfiles/conf.iproute
--- a/colorfiles/conf.iptables
+++ b/colorfiles/conf.iptables
--- a/colorfiles/conf.irclog
+++ b/colorfiles/conf.irclog
--- a/colorfiles/conf.last
+++ b/colorfiles/conf.last
--- a/colorfiles/conf.ldap
+++ b/colorfiles/conf.ldap
--- a/colorfiles/conf.log
+++ b/colorfiles/conf.log
--- a/colorfiles/conf.ls
+++ b/colorfiles/conf.ls
--- a/colorfiles/conf.lsattr
+++ b/colorfiles/conf.lsattr
--- a/colorfiles/conf.lsblk
+++ b/colorfiles/conf.lsblk
--- a/colorfiles/conf.lsmod
+++ b/colorfiles/conf.lsmod
--- a/colorfiles/conf.lspci
+++ b/colorfiles/conf.lspci
--- a/colorfiles/conf.mount
+++ b/colorfiles/conf.mount
--- a/colorfiles/conf.mount.old
+++ b/colorfiles/conf.mount.old
--- a/colorfiles/conf.mtr
+++ b/colorfiles/conf.mtr
--- a/colorfiles/conf.mvn
+++ b/colorfiles/conf.mvn
--- a/colorfiles/conf.netstat
+++ b/colorfiles/conf.netstat
--- a/colorfiles/conf.nmap
+++ b/colorfiles/conf.nmap
--- a/colorfiles/conf.php
+++ b/colorfiles/conf.php
--- a/colorfiles/conf.ping
+++ b/colorfiles/conf.ping
--- a/colorfiles/conf.ping2
+++ b/colorfiles/conf.ping2
--- a/colorfiles/conf.proftpd
+++ b/colorfiles/conf.proftpd
--- a/colorfiles/conf.ps
+++ b/colorfiles/conf.ps
--- a/colorfiles/conf.pv
+++ b/colorfiles/conf.pv
--- a/colorfiles/conf.semanage
+++ b/colorfiles/conf.semanage
--- a/colorfiles/conf.showmount
+++ b/colorfiles/conf.showmount
--- a/colorfiles/conf.sql
+++ b/colorfiles/conf.sql
--- a/colorfiles/conf.ss
+++ b/colorfiles/conf.ss
--- a/colorfiles/conf.stat
+++ b/colorfiles/conf.stat
--- a/colorfiles/conf.sysctl
+++ b/colorfiles/conf.sysctl
--- a/colorfiles/conf.systemctl
+++ b/colorfiles/conf.systemctl
--- a/colorfiles/conf.tcpdump
+++ b/colorfiles/conf.tcpdump
--- a/colorfiles/conf.traceroute
+++ b/colorfiles/conf.traceroute
--- a/colorfiles/conf.tune2fs
+++ b/colorfiles/conf.tune2fs
--- a/colorfiles/conf.ulimit
+++ b/colorfiles/conf.ulimit
--- a/colorfiles/conf.uptime
+++ b/colorfiles/conf.uptime
--- a/colorfiles/conf.vmstat
+++ b/colorfiles/conf.vmstat
--- a/colorfiles/conf.wdiff
+++ b/colorfiles/conf.wdiff
--- a/grc.spec
+++ b/grc.spec
@ -34,7 +34,7 @@ install -d -m 755 $RPM_BUILD_ROOT%{prefix}/bin
 install -m 755 grc $RPM_BUILD_ROOT%{prefix}/bin
 install -m 755 grcat $RPM_BUILD_ROOT%{prefix}/bin
 install -d -m 755 $RPM_BUILD_ROOT%{prefix}/share/grc
-install -m 644 conf.* $RPM_BUILD_ROOT%{prefix}/share/grc
+install -m 644 colorfiles/conf.* $RPM_BUILD_ROOT%{prefix}/share/grc
 install -d -m 755 $RPM_BUILD_ROOT%{confdir}
 install -m 644 grc.conf $RPM_BUILD_ROOT%{confdir}
 install -d -m 755 $RPM_BUILD_ROOT%{_mandir}/man1
--- a/install.sh
+++ b/install.sh
@ -2,11 +2,8 @@

 set -e

-PREFIX=$1
+PREFIX=${1:-/usr/local}
 ETCPREFIX=$2
-if [ -z $PREFIX ]; then
-  PREFIX=/usr/local
-fi


 BINDIR=$PREFIX/bin
@ -18,7 +15,7 @@ PROFILEDIR=$CONFDIR/profile.d
 mkdir -p $BINDIR || true
 cp -fv grc grcat $BINDIR
 mkdir -p $LIBDIR || true
-cp -fv conf.* $LIBDIR
+cp -fv colorfiles/conf.* $LIBDIR
 mkdir -p $MANDIR/man1
 cp -fv grc.1 $MANDIR/man1
 cp -fv grcat.1 $MANDIR/man1
@ -26,4 +23,3 @@ mkdir -p $CONFDIR
 cp -fv grc.conf $CONFDIR
 mkdir -p $PROFILEDIR
 cp -fv grc.bashrc $PROFILEDIR
-