Skip to content

Commit b3d73af

Browse files
committed
Ensure install scripts work with any Perl version
1 parent 94d06bd commit b3d73af

File tree

2 files changed

+18
-6
lines changed

2 files changed

+18
-6
lines changed

install-db

+9-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
11
#!/bin/bash
22

3-
install -m 644 ADBOS/* /usr/local/share/perl/5.10.1/ADBOS/
4-
mkdir -p /usr/local/share/perl/5.10.1/ADBOS/Schema/Result
5-
install -m 644 ADBOS/Schema/Result/* /usr/local/share/perl/5.10.1/ADBOS/Schema/Result
3+
# Find out local Perl version
4+
pv=`perl -v|grep 'This is perl'`
5+
6+
[[ $pv =~ v([.0-9]+) ]]
7+
perlv=${BASH_REMATCH[1]}
8+
9+
install -m 644 ADBOS/* /usr/local/share/perl/$perlv/ADBOS/
10+
mkdir -p /usr/local/share/perl/$perlv/ADBOS/Schema/Result
11+
install -m 644 ADBOS/Schema/Result/* /usr/local/share/perl/$perlv/ADBOS/Schema/Result
612
install -m 755 process-sigs /usr/local/opdef/
713
install -m 755 serial-dump /usr/local/opdef/
814
install -m 755 testparse.pl /usr/local/opdef/

install-web

+9-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
11
#!/bin/bash
22

3-
install -m 644 ADBOS/* /usr/local/share/perl/5.10.1/ADBOS/
4-
mkdir -p /usr/local/share/perl/5.10.1/ADBOS/Schema/Result
5-
install -m 644 ADBOS/Schema/Result/* /usr/local/share/perl/5.10.1/ADBOS/Schema/Result
3+
# Find out Perl version
4+
pv=`perl -v|grep 'This is perl'`
5+
6+
[[ $pv =~ v([.0-9]+) ]]
7+
perlv=${BASH_REMATCH[1]}
8+
9+
install -m 644 ADBOS/* /usr/local/share/perl/$perlv/ADBOS/
10+
mkdir -p /usr/local/share/perl/$perlv/ADBOS/Schema/Result
11+
install -m 644 ADBOS/Schema/Result/* /usr/local/share/perl/$perlv/ADBOS/Schema/Result
612
cp *.css /var/www/opdef.andybev.com/
713
cp images/* /var/www/opdef.andybev.com/images/
814
cp index.pl /var/www/opdef.andybev.com/

0 commit comments

Comments
 (0)