--- doc/install/linux/install.pl 2019/07/06 18:53:23 1.56 +++ doc/install/linux/install.pl 2019/07/07 23:36:03 1.57 @@ -77,7 +77,7 @@ if (!open(LOG,">>loncapa_install.log")) &mt('Stopping execution.')."\n"; exit; } else { - print LOG '$Id: install.pl,v 1.56 2019/07/06 18:53:23 raeburn Exp $'."\n"; + print LOG '$Id: install.pl,v 1.57 2019/07/07 23:36:03 raeburn Exp $'."\n"; } # @@ -480,7 +480,7 @@ sub check_locale { $command = 'sudo locale-gen en_US.UTF-8'."\n". 'sudo update-locale LANG=en_US.UTF-8'; } elsif ($distro =~ /^(suse|sles)/) { - $command = 'yast language'; + $command = 'yast language'; } elsif (-e '/usr/bin/system-config-language') { $command = 'system-config-language'; } elsif (-e '/usr/bin/localectl') { @@ -1006,14 +1006,14 @@ sub chkapache { } elsif ($distro =~ /^(suse|sles)([\d\.]+)$/) { my ($name,$version) = ($1,$2); my $apache = 'apache'; - my $conf_file = "$instdir/sles-suse/default-server.conf"; + my $conf_file = "$instdir/sles-suse/default-server.conf"; if ($version >= 10) { $apache = 'apache2'; } if (($name eq 'sles') && ($version >= 12)) { $conf_file = "$instdir/sles-suse/apache2.4/default-server.conf"; } - if (!-e "$conf_file") { + if (!-e $conf_file) { $fixapache = 0; print &mt('Warning: No LON-CAPA Apache configuration file found for installation check.')."\n"; } elsif (-e "/etc/$apache/default-server.conf") { @@ -2106,7 +2106,7 @@ if ($callsub{'firewall'}) { } } } - } elsif ($distro =~ /^scientific/) { + } elsif ($distro =~ /^(scientific|oracle)/) { print &mt('Use [_1] to configure the firewall to allow access for [_2].', 'system-config-firewall-tui -- Customize', 'ssh, http')."\n"; @@ -3182,7 +3182,7 @@ sub copy_sysconfig_apache2_file { if (($name eq 'sles') && ($version >= 12)) { $sysconf_file = "$instdir/sles-suse/apache2.4/sysconfig_apache2"; } - copy "$sysconf_file","/etc/sysconfig/apache2"; + copy $sysconf_file,"/etc/sysconfig/apache2"; chmod(0444,"/etc/sysconfig/apache2"); }