Changeset 493dfbe9da731403804599ae7bad95a2bca07fa2 in xas


Ignore:
Timestamp:
11/10/14 16:19:52 (5 years ago)
Author:
root <root@…>
Branches:
master
Children:
c91280cb582532e42a6555898e9c3662f7a6c282
Parents:
e0cd9598453c239e061a84a0634a5fdcff8a4b6b
git-author:
root <root@…> (11/10/14 16:19:52)
git-committer:
root <root@…> (11/10/14 16:19:52)
Message:

Made some minor changes for installation

Location:
trunk
Files:
2 deleted
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/Build.PL

    r8213d475cf38cd0be39f65822ab8b85033d43762 r493dfbe9da731403804599ae7bad95a2bca07fa2  
    3838    'Net::SSH2'                   => 0.44, 
    3939    'Curses'                      => 1.28, 
     40    'WWW::Curl'                   => 0.0, 
    4041}; 
    4142 
     
    6869    use File::Spec::Functions qw( catfile catdir rel2abs ); 
    6970 
     71    # set up directory structure and user/group accounts 
     72 
    7073    sub ACTION_post_install { 
    7174        my $self = shift; 
     
    141144    } 
    142145 
     146    # remove redhat stuff when installing to debian 
     147 
     148    sub ACTION_debian { 
     149        my $self = shift; 
     150 
     151        # cleanup the profile.d directory 
     152 
     153        my $destdir = $self->destdir; 
     154        my @files = ('xas.bat');  
     155        my @names = map { catfile($destdir, 'etc', 'profile.d', $_) } @files; 
     156 
     157        foreach my $file (@names) { 
     158 
     159            unlink $file if (-e $file); 
     160 
     161        } 
     162 
     163    } 
     164 
     165    # remove debian stuff when installing to redhat 
     166 
     167    sub ACTION_redhat { 
     168        my $self = shift; 
     169 
     170        # cleanup the profile.d directory 
     171 
     172        my $destdir = $self->destdir; 
     173        my @files = ('xas.bat');  
     174        my @names = map { catfile($destdir, 'etc', 'profile.d', $_) } @files; 
     175 
     176        foreach my $file (@names) { 
     177 
     178            unlink $file if (-e $file); 
     179 
     180        } 
     181 
     182    } 
     183 
     184    # correctly process additional directories 
     185 
    143186    sub process_etc_files { 
    144187        my $self = shift; 
     
    161204    } 
    162205 
     206    # correctly process additional directories 
     207 
    163208    sub process_sbin_files { 
    164209        my $self = shift; 
     
    173218 
    174219            $to = catfile('blib', $to); 
    175             $self->make_executable($from); 
    176             $result = $self->copy_if_modified(from => $from, to => $to); 
    177  
    178         } 
     220            $result = $self->copy_if_modified(from => $from, to => $to) or next; 
     221            $self->fix_shebang_line($result) unless $self->is_vmsish; 
     222            $self->make_executable($result); 
     223 
     224        } 
     225 
     226        $self->manify_sbin_pods(); 
    179227 
    180228        return $self; 
     
    215263 
    216264            $to = catfile('blib', $to); 
    217             $self->make_executable($from); 
    218265            $result = $self->copy_if_modified(from => $from, to => $to); 
    219266 
     
    283330        return { map {$_, $_} @{ $self->rscan_dir($dir, $sub) } }; 
    284331 
     332    } 
     333 
     334    # fix for when scm files are in the script directory 
     335 
     336    sub _files_in { 
     337        my ($self, $dir) = @_; 
     338        return unless -d $dir; 
     339 
     340        local *DH; 
     341        opendir DH, $dir or die "Can't read directory $dir: $!"; 
     342 
     343        my @files; 
     344        while (defined (my $file = readdir DH)) { 
     345           my $full_path = File::Spec->catfile($dir, $file); 
     346           next if -d $full_path; 
     347           next if (($file =~ /SVN/i) or ($file =~ /GIT/i)); 
     348           push @files, $full_path; 
     349       } 
     350       return @files; 
    285351    } 
    286352EOC 
  • trunk/MANIFEST

    r91b017ea5b23ccf691f883c7610d7e7a493633a2 r493dfbe9da731403804599ae7bad95a2bca07fa2  
    1 bin/rotate 
     1bin/xas-rotate 
    22Build.PL 
    33Changes 
     
    1212debian/rules 
    1313debian/watch 
    14 etc/rotate.ini 
     14etc/xas-rotate.ini 
    1515ignore.txt 
    1616lib/XAS.pm 
     
    3535lib/XAS/Lib/Curses/Unix.pm 
    3636lib/XAS/Lib/Curses/Win32.pm 
     37lib/XAS/Lib/Mixins/Bufops.pm 
    3738lib/XAS/Lib/Mixins/Configs.pm 
    3839lib/XAS/Lib/Mixins/Handlers.pm 
    3940lib/XAS/Lib/Mixins/Iterator.pm 
    4041lib/XAS/Lib/Mixins/Keepalive.pm 
     42lib/XAS/Lib/Mixins/JSON/Client.pm 
     43lib/XAS/Lib/Mixins/JSON/Server.pm 
    4144lib/XAS/Lib/Modules/Alerts.pm 
    4245lib/XAS/Lib/Modules/Email.pm 
  • trunk/debian/rules

    rb34ca42421052387db5300d1596254677b7afcf3 r493dfbe9da731403804599ae7bad95a2bca07fa2  
    2323        $(PERL) Build test 
    2424        $(PERL) Build install destdir=$(TMP) create_packlist=0 
     25        $(PERL) Build debian destdir=$(TMP) 
    2526 
    2627build: build-indep 
  • trunk/lib/XAS/Lib/SSH/Server.pm

    rc5596c0d76dbacce5903e2d68a28b383557884c6 r493dfbe9da731403804599ae7bad95a2bca07fa2  
    145145    ); 
    146146 
    147     $poe_kernel->post($alias, 'handle_connection', $client->ID); 
     147    $poe_kernel->post($alias, 'handle_connection', $self->client->ID); 
    148148 
    149149} 
  • trunk/perl-XAS.spec

    r02e63ea8e5fd59bb0d24401148b48650779fcc52 r493dfbe9da731403804599ae7bad95a2bca07fa2  
    99BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
    1010BuildArch:      noarch 
    11 BuildRequires:  perl(Badger) >= 0.09 
    12 BuildRequires:  perl(Config::IniFiles) >= 2.72 
    13 BuildRequires:  perl(DateTime) >= 0.53 
    14 BuildRequires:  perl(DateTime::Format::Pg) 
    15 BuildRequires:  perl(DateTime::Format::Strptime) >= 1.1 
    16 BuildRequires:  perl(File::Pid) 
    17 BuildRequires:  perl(Hash::Merge) >= 0.12 
    18 BuildRequires:  perl(JSON::XS) >= 2.27 
    19 BuildRequires:  perl(LockFile::Simple) >= 0.207 
    20 BuildRequires:  perl(MIME::Lite) >= 3.027 
    21 BuildRequires:  perl(Module::Build) 
    22 BuildRequires:  perl(Params::Validate) >= 0.92 
    23 BuildRequires:  perl(POE) >= 1.35 
    2411BuildRequires:  perl(Test::More) 
    25 BuildRequires:  perl(Try::Tiny::Retry) >= 0.0 
     12Requires:       perl(POE) >= 1.35 
    2613Requires:       perl(Badger) >= 0.09 
     14Requires:       perl(Curses) >= 1.28 
     15Requires:       perl(DateTime) >= 0.53 
     16Requires:       perl(JSON::XS) >= 2.27 
     17Requires:       perl(File::Pid) >= 0.0 
     18Requires:       perl(Net::SSH2) >= 0.44 
     19Requires:       perl(Try::Tiny) >= 0.0 
     20Requires:       perl(WWW::Curl) >= 4.15 
     21Requires:       perl(MIME::Lite) >= 3.027 
     22Requires:       perl(Pod::Usage) >= 1.35 
     23Requires:       perl(Set::Light) >= 0.04 
     24Requires:       perl(Hash::Merge) >= 0.12 
     25Requires:       perl(Try::Tiny::Retry) >= 0.0 
    2726Requires:       perl(Config::IniFiles) >= 2.72 
    28 Requires:       perl(DateTime) >= 0.53 
    29 Requires:       perl(DateTime::Format::Pg) 
     27Requires:       perl(Params::Validate) >= 0.92 
     28Requires:       perl(LockFile::Simple) >= 0.207 
     29Requires:       perl(DateTime::Format::Pg) >= 0.0 
    3030Requires:       perl(DateTime::Format::Strptime) >= 1.1 
    31 Requires:       perl(File::Pid) 
    32 Requires:       perl(Hash::Merge) >= 0.12 
    33 Requires:       perl(JSON::XS) >= 2.27 
    34 Requires:       perl(LockFile::Simple) >= 0.207 
    35 Requires:       perl(MIME::Lite) >= 3.027 
    36 Requires:       perl(Params::Validate) >= 0.92 
    37 Requires:       perl(POE) >= 1.35 
    38 Requires:       perl(Try::Tiny::Retry) >= 0.0 
    3931Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) 
    4032 
     
    7466 
    7567./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 
     68./Build redhat destdir=$RPM_BUILD_ROOT 
    7669find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; 
    7770 
     
    9487chmod g+s /var/spool/xas/alerts 
    9588chmod g+s /var/spool/xas/logstash 
    96 rm -F /etc/profile.d/xas.bat 
    9789 
    9890%postun 
     
    112104%doc Changes perl-XAS.spec README 
    113105%{perl_sitelib}/* 
     106%config(noreplace) /etc/profile.d/xas.sh 
    114107/usr/local/share/man/man3/* 
    115 /etc/profile.d/* 
    116108 
    117109%changelog 
Note: See TracChangeset for help on using the changeset viewer.