Changeset 109

Show
Ignore:
Timestamp:
11/14/07 11:53:51 (1 year ago)
Author:
jjarrett
Message:

updated STIG script handling

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/RHEL5/rpmify

    r108 r109  
    66OS="RHEL5.1" 
    77 
    8 tar --exclude="*.svn*" -czvf RPM/clip-$VERSION-$RELEASE.tar.gz pam_tally3/ conf/ kickstart/ scripts/ man/ Makefile 
    9 sudo cp RPM/clip-$VERSION-$RELEASE.tar.gz /usr/src/redhat/SOURCES 
     8tar --exclude="*.svn*" -czvf RPM/clip-$VERSION-$RELEASE.$ARCH.$OS.tar.gz pam_tally3/ conf/ kickstart/ scripts/ man/ Makefile 
     9sudo cp RPM/clip-$VERSION-$RELEASE.$ARCH.$OS.tar.gz /usr/src/redhat/SOURCES 
    1010sudo rpmbuild -ba RPM/clip.spec 
    11 cp /usr/src/redhat/RPMS/$ARCH/clip-$VERSION-$RELEASE.$ARCH.rpm RPM/clip-$VERSION-$RELEASE.$ARCH.$OS.rpm 
     11cp /usr/src/redhat/RPMS/$ARCH/clip-$VERSION-$RELEASE..$ARCH.$OS.rpm RPM/clip-$VERSION-$RELEASE.$ARCH.$OS.rpm 
    1212cp /usr/src/redhat/SRPMS/clip-$VERSION-$RELEASE.src.rpm RPM/clip-$VERSION-$RELEASE.$OS.src.rpm 
    1313 

  • trunk/RHEL5/scripts/Makefile

    r102 r109  
    44 
    55install:  
     6        rm -rf *~ 
    67        test -d $(DESTDIR)$(BINDIR) || install -m 755 -d $(DESTDIR)$(BINDIR) 
    78        test -d $(DESTDIR)$(BINDIR)/protected || install -m 755 -d $(DESTDIR)$(BINDIR)/protected 
    …… 
    3536        # Install scripts 
    3637        install -m 700 stig-fix/run-fixes.sh $(DESTDIR)$(SHAREDIR)/scripts/stig-fix  
    37         install -m 700 stig-fix/cat1/*.sh $(DESTDIR)$(SHAREDIR)/scripts/stig-fix/cat1  
    38         install -m 700 stig-fix/cat2/*.sh $(DESTDIR)$(SHAREDIR)/scripts/stig-fix/cat2  
    39         install -m 700 stig-fix/cat3/*.sh $(DESTDIR)$(SHAREDIR)/scripts/stig-fix/cat3  
     38        install -m 700 stig-fix/cat1/* $(DESTDIR)$(SHAREDIR)/scripts/stig-fix/cat1  
     39        install -m 700 stig-fix/cat2/* $(DESTDIR)$(SHAREDIR)/scripts/stig-fix/cat2  
     40        install -m 700 stig-fix/cat3/* $(DESTDIR)$(SHAREDIR)/scripts/stig-fix/cat3  
    4041 
    4142        # Patch installer  

  • trunk/RHEL5/scripts/installer.in

    r102 r109  
    77PAMDIR=$BASE/clip/conf/pam 
    88MANDIR=$BASE/clip/man/man8 
     9STIGFIXDIR=$BASE/clip/script/stig-fix 
    910 
    1011Copy() { 
    …… 
    6061# cp and not Copy() is used to install these files.  
    6162InstallStig() { 
    62         for d in $(ls -R STIGFIXDIR); do 
     63        for d in $(ls -R $STIGFIXDIR); do 
    6364                cp -r $d /usr/share/clip/scripts/stig-fix &2>/dev/null 
    6465        done