From 96073d87661f75564f35460454377002906ccf06 Mon Sep 17 00:00:00 2001 From: Isaias Pina Date: Tue, 28 Feb 2017 11:29:50 -0600 Subject: [PATCH] Move colorfiles to folder --- INSTALL | 2 +- conf.ant => colorfiles/conf.ant | 0 conf.blkid => colorfiles/conf.blkid | 0 conf.configure => colorfiles/conf.configure | 0 conf.cvs => colorfiles/conf.cvs | 0 conf.df => colorfiles/conf.df | 0 conf.diff => colorfiles/conf.diff | 0 conf.dig => colorfiles/conf.dig | 0 conf.dnf => colorfiles/conf.dnf | 0 conf.docker-machinels => colorfiles/conf.docker-machinels | 0 conf.dockerimages => colorfiles/conf.dockerimages | 0 conf.dockerinfo => colorfiles/conf.dockerinfo | 0 conf.dockernetwork => colorfiles/conf.dockernetwork | 0 conf.dockerps => colorfiles/conf.dockerps | 0 conf.dockerpull => colorfiles/conf.dockerpull | 0 conf.dockersearch => colorfiles/conf.dockersearch | 0 conf.dockerversion => colorfiles/conf.dockerversion | 0 conf.du => colorfiles/conf.du | 0 conf.env => colorfiles/conf.env | 0 conf.esperanto => colorfiles/conf.esperanto | 0 conf.free => colorfiles/conf.free | 0 conf.gcc => colorfiles/conf.gcc | 0 conf.getfacl => colorfiles/conf.getfacl | 0 conf.getsebool => colorfiles/conf.getsebool | 0 conf.ifconfig => colorfiles/conf.ifconfig | 0 conf.iostat_sar => colorfiles/conf.iostat_sar | 0 conf.ip => colorfiles/conf.ip | 0 conf.ipaddr => colorfiles/conf.ipaddr | 0 conf.ipneighbor => colorfiles/conf.ipneighbor | 0 conf.iproute => colorfiles/conf.iproute | 0 conf.iptables => colorfiles/conf.iptables | 0 conf.irclog => colorfiles/conf.irclog | 0 conf.last => colorfiles/conf.last | 0 conf.ldap => colorfiles/conf.ldap | 0 conf.log => colorfiles/conf.log | 0 conf.ls => colorfiles/conf.ls | 0 conf.lsattr => colorfiles/conf.lsattr | 0 conf.lsblk => colorfiles/conf.lsblk | 0 conf.lsmod => colorfiles/conf.lsmod | 0 conf.lspci => colorfiles/conf.lspci | 0 conf.mount => colorfiles/conf.mount | 0 conf.mount.old => colorfiles/conf.mount.old | 0 conf.mtr => colorfiles/conf.mtr | 0 conf.mvn => colorfiles/conf.mvn | 0 conf.netstat => colorfiles/conf.netstat | 0 conf.nmap => colorfiles/conf.nmap | 0 conf.php => colorfiles/conf.php | 0 conf.ping => colorfiles/conf.ping | 0 conf.ping2 => colorfiles/conf.ping2 | 0 conf.proftpd => colorfiles/conf.proftpd | 0 conf.ps => colorfiles/conf.ps | 0 conf.pv => colorfiles/conf.pv | 0 conf.semanage => colorfiles/conf.semanage | 0 conf.showmount => colorfiles/conf.showmount | 0 conf.sql => colorfiles/conf.sql | 0 conf.ss => colorfiles/conf.ss | 0 conf.stat => colorfiles/conf.stat | 0 conf.sysctl => colorfiles/conf.sysctl | 0 conf.systemctl => colorfiles/conf.systemctl | 0 conf.tcpdump => colorfiles/conf.tcpdump | 0 conf.traceroute => colorfiles/conf.traceroute | 0 conf.tune2fs => colorfiles/conf.tune2fs | 0 conf.ulimit => colorfiles/conf.ulimit | 0 conf.uptime => colorfiles/conf.uptime | 0 conf.vmstat => colorfiles/conf.vmstat | 0 conf.wdiff => colorfiles/conf.wdiff | 0 grc.spec | 2 +- install.sh | 8 ++------ 68 files changed, 4 insertions(+), 8 deletions(-) rename conf.ant => colorfiles/conf.ant (100%) rename conf.blkid => colorfiles/conf.blkid (100%) rename conf.configure => colorfiles/conf.configure (100%) rename conf.cvs => colorfiles/conf.cvs (100%) rename conf.df => colorfiles/conf.df (100%) rename conf.diff => colorfiles/conf.diff (100%) rename conf.dig => colorfiles/conf.dig (100%) rename conf.dnf => colorfiles/conf.dnf (100%) rename conf.docker-machinels => colorfiles/conf.docker-machinels (100%) rename conf.dockerimages => colorfiles/conf.dockerimages (100%) rename conf.dockerinfo => colorfiles/conf.dockerinfo (100%) rename conf.dockernetwork => colorfiles/conf.dockernetwork (100%) rename conf.dockerps => colorfiles/conf.dockerps (100%) rename conf.dockerpull => colorfiles/conf.dockerpull (100%) rename conf.dockersearch => colorfiles/conf.dockersearch (100%) rename conf.dockerversion => colorfiles/conf.dockerversion (100%) rename conf.du => colorfiles/conf.du (100%) rename conf.env => colorfiles/conf.env (100%) rename conf.esperanto => colorfiles/conf.esperanto (100%) rename conf.free => colorfiles/conf.free (100%) rename conf.gcc => colorfiles/conf.gcc (100%) rename conf.getfacl => colorfiles/conf.getfacl (100%) rename conf.getsebool => colorfiles/conf.getsebool (100%) rename conf.ifconfig => colorfiles/conf.ifconfig (100%) rename conf.iostat_sar => colorfiles/conf.iostat_sar (100%) rename conf.ip => colorfiles/conf.ip (100%) rename conf.ipaddr => colorfiles/conf.ipaddr (100%) rename conf.ipneighbor => colorfiles/conf.ipneighbor (100%) rename conf.iproute => colorfiles/conf.iproute (100%) rename conf.iptables => colorfiles/conf.iptables (100%) rename conf.irclog => colorfiles/conf.irclog (100%) rename conf.last => colorfiles/conf.last (100%) rename conf.ldap => colorfiles/conf.ldap (100%) rename conf.log => colorfiles/conf.log (100%) rename conf.ls => colorfiles/conf.ls (100%) rename conf.lsattr => colorfiles/conf.lsattr (100%) rename conf.lsblk => colorfiles/conf.lsblk (100%) rename conf.lsmod => colorfiles/conf.lsmod (100%) rename conf.lspci => colorfiles/conf.lspci (100%) rename conf.mount => colorfiles/conf.mount (100%) rename conf.mount.old => colorfiles/conf.mount.old (100%) rename conf.mtr => colorfiles/conf.mtr (100%) rename conf.mvn => colorfiles/conf.mvn (100%) rename conf.netstat => colorfiles/conf.netstat (100%) rename conf.nmap => colorfiles/conf.nmap (100%) rename conf.php => colorfiles/conf.php (100%) rename conf.ping => colorfiles/conf.ping (100%) rename conf.ping2 => colorfiles/conf.ping2 (100%) rename conf.proftpd => colorfiles/conf.proftpd (100%) rename conf.ps => colorfiles/conf.ps (100%) rename conf.pv => colorfiles/conf.pv (100%) rename conf.semanage => colorfiles/conf.semanage (100%) rename conf.showmount => colorfiles/conf.showmount (100%) rename conf.sql => colorfiles/conf.sql (100%) rename conf.ss => colorfiles/conf.ss (100%) rename conf.stat => colorfiles/conf.stat (100%) rename conf.sysctl => colorfiles/conf.sysctl (100%) rename conf.systemctl => colorfiles/conf.systemctl (100%) rename conf.tcpdump => colorfiles/conf.tcpdump (100%) rename conf.traceroute => colorfiles/conf.traceroute (100%) rename conf.tune2fs => colorfiles/conf.tune2fs (100%) rename conf.ulimit => colorfiles/conf.ulimit (100%) rename conf.uptime => colorfiles/conf.uptime (100%) rename conf.vmstat => colorfiles/conf.vmstat (100%) rename conf.wdiff => colorfiles/conf.wdiff (100%) diff --git a/INSTALL b/INSTALL index b4a1466..3deb0a4 100644 --- a/INSTALL +++ b/INSTALL @@ -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/ diff --git a/conf.ant b/colorfiles/conf.ant similarity index 100% rename from conf.ant rename to colorfiles/conf.ant diff --git a/conf.blkid b/colorfiles/conf.blkid similarity index 100% rename from conf.blkid rename to colorfiles/conf.blkid diff --git a/conf.configure b/colorfiles/conf.configure similarity index 100% rename from conf.configure rename to colorfiles/conf.configure diff --git a/conf.cvs b/colorfiles/conf.cvs similarity index 100% rename from conf.cvs rename to colorfiles/conf.cvs diff --git a/conf.df b/colorfiles/conf.df similarity index 100% rename from conf.df rename to colorfiles/conf.df diff --git a/conf.diff b/colorfiles/conf.diff similarity index 100% rename from conf.diff rename to colorfiles/conf.diff diff --git a/conf.dig b/colorfiles/conf.dig similarity index 100% rename from conf.dig rename to colorfiles/conf.dig diff --git a/conf.dnf b/colorfiles/conf.dnf similarity index 100% rename from conf.dnf rename to colorfiles/conf.dnf diff --git a/conf.docker-machinels b/colorfiles/conf.docker-machinels similarity index 100% rename from conf.docker-machinels rename to colorfiles/conf.docker-machinels diff --git a/conf.dockerimages b/colorfiles/conf.dockerimages similarity index 100% rename from conf.dockerimages rename to colorfiles/conf.dockerimages diff --git a/conf.dockerinfo b/colorfiles/conf.dockerinfo similarity index 100% rename from conf.dockerinfo rename to colorfiles/conf.dockerinfo diff --git a/conf.dockernetwork b/colorfiles/conf.dockernetwork similarity index 100% rename from conf.dockernetwork rename to colorfiles/conf.dockernetwork diff --git a/conf.dockerps b/colorfiles/conf.dockerps similarity index 100% rename from conf.dockerps rename to colorfiles/conf.dockerps diff --git a/conf.dockerpull b/colorfiles/conf.dockerpull similarity index 100% rename from conf.dockerpull rename to colorfiles/conf.dockerpull diff --git a/conf.dockersearch b/colorfiles/conf.dockersearch similarity index 100% rename from conf.dockersearch rename to colorfiles/conf.dockersearch diff --git a/conf.dockerversion b/colorfiles/conf.dockerversion similarity index 100% rename from conf.dockerversion rename to colorfiles/conf.dockerversion diff --git a/conf.du b/colorfiles/conf.du similarity index 100% rename from conf.du rename to colorfiles/conf.du diff --git a/conf.env b/colorfiles/conf.env similarity index 100% rename from conf.env rename to colorfiles/conf.env diff --git a/conf.esperanto b/colorfiles/conf.esperanto similarity index 100% rename from conf.esperanto rename to colorfiles/conf.esperanto diff --git a/conf.free b/colorfiles/conf.free similarity index 100% rename from conf.free rename to colorfiles/conf.free diff --git a/conf.gcc b/colorfiles/conf.gcc similarity index 100% rename from conf.gcc rename to colorfiles/conf.gcc diff --git a/conf.getfacl b/colorfiles/conf.getfacl similarity index 100% rename from conf.getfacl rename to colorfiles/conf.getfacl diff --git a/conf.getsebool b/colorfiles/conf.getsebool similarity index 100% rename from conf.getsebool rename to colorfiles/conf.getsebool diff --git a/conf.ifconfig b/colorfiles/conf.ifconfig similarity index 100% rename from conf.ifconfig rename to colorfiles/conf.ifconfig diff --git a/conf.iostat_sar b/colorfiles/conf.iostat_sar similarity index 100% rename from conf.iostat_sar rename to colorfiles/conf.iostat_sar diff --git a/conf.ip b/colorfiles/conf.ip similarity index 100% rename from conf.ip rename to colorfiles/conf.ip diff --git a/conf.ipaddr b/colorfiles/conf.ipaddr similarity index 100% rename from conf.ipaddr rename to colorfiles/conf.ipaddr diff --git a/conf.ipneighbor b/colorfiles/conf.ipneighbor similarity index 100% rename from conf.ipneighbor rename to colorfiles/conf.ipneighbor diff --git a/conf.iproute b/colorfiles/conf.iproute similarity index 100% rename from conf.iproute rename to colorfiles/conf.iproute diff --git a/conf.iptables b/colorfiles/conf.iptables similarity index 100% rename from conf.iptables rename to colorfiles/conf.iptables diff --git a/conf.irclog b/colorfiles/conf.irclog similarity index 100% rename from conf.irclog rename to colorfiles/conf.irclog diff --git a/conf.last b/colorfiles/conf.last similarity index 100% rename from conf.last rename to colorfiles/conf.last diff --git a/conf.ldap b/colorfiles/conf.ldap similarity index 100% rename from conf.ldap rename to colorfiles/conf.ldap diff --git a/conf.log b/colorfiles/conf.log similarity index 100% rename from conf.log rename to colorfiles/conf.log diff --git a/conf.ls b/colorfiles/conf.ls similarity index 100% rename from conf.ls rename to colorfiles/conf.ls diff --git a/conf.lsattr b/colorfiles/conf.lsattr similarity index 100% rename from conf.lsattr rename to colorfiles/conf.lsattr diff --git a/conf.lsblk b/colorfiles/conf.lsblk similarity index 100% rename from conf.lsblk rename to colorfiles/conf.lsblk diff --git a/conf.lsmod b/colorfiles/conf.lsmod similarity index 100% rename from conf.lsmod rename to colorfiles/conf.lsmod diff --git a/conf.lspci b/colorfiles/conf.lspci similarity index 100% rename from conf.lspci rename to colorfiles/conf.lspci diff --git a/conf.mount b/colorfiles/conf.mount similarity index 100% rename from conf.mount rename to colorfiles/conf.mount diff --git a/conf.mount.old b/colorfiles/conf.mount.old similarity index 100% rename from conf.mount.old rename to colorfiles/conf.mount.old diff --git a/conf.mtr b/colorfiles/conf.mtr similarity index 100% rename from conf.mtr rename to colorfiles/conf.mtr diff --git a/conf.mvn b/colorfiles/conf.mvn similarity index 100% rename from conf.mvn rename to colorfiles/conf.mvn diff --git a/conf.netstat b/colorfiles/conf.netstat similarity index 100% rename from conf.netstat rename to colorfiles/conf.netstat diff --git a/conf.nmap b/colorfiles/conf.nmap similarity index 100% rename from conf.nmap rename to colorfiles/conf.nmap diff --git a/conf.php b/colorfiles/conf.php similarity index 100% rename from conf.php rename to colorfiles/conf.php diff --git a/conf.ping b/colorfiles/conf.ping similarity index 100% rename from conf.ping rename to colorfiles/conf.ping diff --git a/conf.ping2 b/colorfiles/conf.ping2 similarity index 100% rename from conf.ping2 rename to colorfiles/conf.ping2 diff --git a/conf.proftpd b/colorfiles/conf.proftpd similarity index 100% rename from conf.proftpd rename to colorfiles/conf.proftpd diff --git a/conf.ps b/colorfiles/conf.ps similarity index 100% rename from conf.ps rename to colorfiles/conf.ps diff --git a/conf.pv b/colorfiles/conf.pv similarity index 100% rename from conf.pv rename to colorfiles/conf.pv diff --git a/conf.semanage b/colorfiles/conf.semanage similarity index 100% rename from conf.semanage rename to colorfiles/conf.semanage diff --git a/conf.showmount b/colorfiles/conf.showmount similarity index 100% rename from conf.showmount rename to colorfiles/conf.showmount diff --git a/conf.sql b/colorfiles/conf.sql similarity index 100% rename from conf.sql rename to colorfiles/conf.sql diff --git a/conf.ss b/colorfiles/conf.ss similarity index 100% rename from conf.ss rename to colorfiles/conf.ss diff --git a/conf.stat b/colorfiles/conf.stat similarity index 100% rename from conf.stat rename to colorfiles/conf.stat diff --git a/conf.sysctl b/colorfiles/conf.sysctl similarity index 100% rename from conf.sysctl rename to colorfiles/conf.sysctl diff --git a/conf.systemctl b/colorfiles/conf.systemctl similarity index 100% rename from conf.systemctl rename to colorfiles/conf.systemctl diff --git a/conf.tcpdump b/colorfiles/conf.tcpdump similarity index 100% rename from conf.tcpdump rename to colorfiles/conf.tcpdump diff --git a/conf.traceroute b/colorfiles/conf.traceroute similarity index 100% rename from conf.traceroute rename to colorfiles/conf.traceroute diff --git a/conf.tune2fs b/colorfiles/conf.tune2fs similarity index 100% rename from conf.tune2fs rename to colorfiles/conf.tune2fs diff --git a/conf.ulimit b/colorfiles/conf.ulimit similarity index 100% rename from conf.ulimit rename to colorfiles/conf.ulimit diff --git a/conf.uptime b/colorfiles/conf.uptime similarity index 100% rename from conf.uptime rename to colorfiles/conf.uptime diff --git a/conf.vmstat b/colorfiles/conf.vmstat similarity index 100% rename from conf.vmstat rename to colorfiles/conf.vmstat diff --git a/conf.wdiff b/colorfiles/conf.wdiff similarity index 100% rename from conf.wdiff rename to colorfiles/conf.wdiff diff --git a/grc.spec b/grc.spec index 6efbde7..6c8335f 100644 --- 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 diff --git a/install.sh b/install.sh index ebc3b1c..5871652 100755 --- 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 -