--- doc/loncapafiles/rpmcheck.piml	2010/05/04 01:39:26	1.19
+++ doc/loncapafiles/rpmcheck.piml	2020/01/04 18:03:16	1.49
@@ -3,7 +3,7 @@
 <!-- phpcheck.piml -->
 <!-- Matthew Hall -->
 
-<!-- $Id: rpmcheck.piml,v 1.19 2010/05/04 01:39:26 raeburn Exp $ -->
+<!-- $Id: rpmcheck.piml,v 1.49 2020/01/04 18:03:16 raeburn Exp $ -->
 
 <!--
 
@@ -81,16 +81,41 @@ foreach my $rpm ('gnuplot-3.7.1-5','LON-
     }
 }
 </perlscript>
-<perlscript dist="fedora1 fedora2 fedora3 fedora4 fedora5 fedora6 fedora7 fedora8 fedora9 fedora10 fedora11 fedora12 fedora13 suse9.2 suse9.3 suse10.1 suse10.2 suse10.3 sles9 sles10 sles11 suse11.1 suse11.2" mode="fg">
-my @RPMS = `rpm -q -a`;
-foreach my $rpm ('LONCAPA-prerequisites') {
-    my @matching_rpms = grep(/$rpm/,@RPMS);
-    if (! @matching_rpms) {
-        print "**** WARNING: ".$rpm." does not appear to be installed.\n";
+<perlscript dist="fedora1 fedora2 fedora3 fedora4 fedora5 fedora6 fedora7 fedora8 fedora9 fedora10 fedora11 fedora12 fedora13 fedora14 fedora15 fedora16 fedora17 fedora18 fedora19 fedora20 fedora21 fedora22 fedora23 fedora24 fedora25 fedora26 fedora27 fedora28 fedora29 fedora30 fedora31 rhes5 rhes6 rhes7 rhes8 centos5 scientific5 scientific6 centos6 oracle6 scientific7 centos7 oracle7 centos8 oracle8 suse9.2 suse9.3 suse10.1 suse10.2 suse10.3 sles9 sles10 sles11 sles12 sles15 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 suse12.3 suse13.1 suse13.2" mode="fg">
+my $hasprereqs = 0;
+if (open(PIPE,"rpm -q LONCAPA-prerequisites|")) {
+    my @lines = (&lt;PIPE&gt;);
+    close(PIPE);
+    chomp(@lines);
+    foreach my $line (@lines) {
+        if ($line =~ /^\QLONCAPA-prerequisites-\E[.\w\-]+$/) {
+            $hasprereqs = 1;
+            last;
+        }
     }
 }
+if (!$hasprereqs) {
+    print "**** WARNING: LONCAPA-prerequisites does not appear to be installed.\n";
+}
+</perlscript>
+<perlscript dist="debian5 debian6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16 ubuntu18 ubuntu20" mode="fg">
+my $hasprereqs = 0;
+if (open(PIPE,"dpkg -l loncapa-prerequisites|")) {
+    my @lines = (&lt;PIPE&gt;);
+    close(PIPE);
+    chomp(@lines);
+    foreach my $line (@lines) { 
+        if ($line =~ /^ii\s+\Qloncapa-prerequisites\E\s+([.\d\-]+)/) {
+            $hasprereqs = 1;
+            last;
+        }
+    }
+}
+if (!$hasprereqs) { 
+    print "**** WARNING: loncapa-prerequisites does not appear to be installed.\n";
+}
 </perlscript>
-<perlscript dist="debian gentoo">
+<perlscript dist="gentoo">
 print &lt;&lt;END;
 **** WARNING: We don't know much about your distribution.
     Check with the loncapa development team for help satisfying