From 5eb168b827e2823ee0332bb8e097f87faeffd5c2 Mon Sep 17 00:00:00 2001
From: Brian Fraser <brian.fraser@percona.com>
Date: Fri, 14 Sep 2012 09:33:52 -0300
Subject: [PATCH] Fix for version-check in openSuSe

---
 bin/pt-archiver              | 4 ++++
 bin/pt-config-diff           | 4 ++++
 bin/pt-deadlock-logger       | 4 ++++
 bin/pt-diskstats             | 4 ++++
 bin/pt-duplicate-key-checker | 4 ++++
 bin/pt-find                  | 4 ++++
 bin/pt-fk-error-logger       | 4 ++++
 bin/pt-heartbeat             | 4 ++++
 bin/pt-index-usage           | 4 ++++
 bin/pt-kill                  | 4 ++++
 bin/pt-online-schema-change  | 4 ++++
 bin/pt-query-advisor         | 4 ++++
 bin/pt-query-digest          | 4 ++++
 bin/pt-slave-delay           | 4 ++++
 bin/pt-slave-restart         | 4 ++++
 bin/pt-table-checksum        | 4 ++++
 bin/pt-upgrade               | 4 ++++
 bin/pt-variable-advisor      | 4 ++++
 lib/VersionCheck.pm          | 4 ++++
 19 files changed, 76 insertions(+)

diff --git a/bin/pt-archiver b/bin/pt-archiver
index fa93598c..d72983f4 100755
--- a/bin/pt-archiver
+++ b/bin/pt-archiver
@@ -3992,6 +3992,10 @@ sub get_os_version {
              $release .= " ($code_name)" if $code_name;
          }
       }
+      elsif ( -f "/etc/os-release" ) { # openSUSE
+         chomp($release = `grep PRETTY_NAME /etc/os-release`);
+         $release =~ s/^PRETTY_NAME="(.+)"$/$1/;
+      }
       elsif ( `ls /etc/*release 2>/dev/null` ) {
          if ( `grep DISTRIB_DESCRIPTION /etc/*release 2>/dev/null` ) {
             $release = `grep DISTRIB_DESCRIPTION /etc/*release | head -n1`;
diff --git a/bin/pt-config-diff b/bin/pt-config-diff
index 2ebf4c80..2af5ffca 100755
--- a/bin/pt-config-diff
+++ b/bin/pt-config-diff
@@ -3107,6 +3107,10 @@ sub get_os_version {
              $release .= " ($code_name)" if $code_name;
          }
       }
+      elsif ( -f "/etc/os-release" ) { # openSUSE
+         chomp($release = `grep PRETTY_NAME /etc/os-release`);
+         $release =~ s/^PRETTY_NAME="(.+)"$/$1/;
+      }
       elsif ( `ls /etc/*release 2>/dev/null` ) {
          if ( `grep DISTRIB_DESCRIPTION /etc/*release 2>/dev/null` ) {
             $release = `grep DISTRIB_DESCRIPTION /etc/*release | head -n1`;
diff --git a/bin/pt-deadlock-logger b/bin/pt-deadlock-logger
index 4d7c42a6..af853bdd 100755
--- a/bin/pt-deadlock-logger
+++ b/bin/pt-deadlock-logger
@@ -2551,6 +2551,10 @@ sub get_os_version {
              $release .= " ($code_name)" if $code_name;
          }
       }
+      elsif ( -f "/etc/os-release" ) { # openSUSE
+         chomp($release = `grep PRETTY_NAME /etc/os-release`);
+         $release =~ s/^PRETTY_NAME="(.+)"$/$1/;
+      }
       elsif ( `ls /etc/*release 2>/dev/null` ) {
          if ( `grep DISTRIB_DESCRIPTION /etc/*release 2>/dev/null` ) {
             $release = `grep DISTRIB_DESCRIPTION /etc/*release | head -n1`;
diff --git a/bin/pt-diskstats b/bin/pt-diskstats
index 7bad5b6a..bcb51789 100755
--- a/bin/pt-diskstats
+++ b/bin/pt-diskstats
@@ -3662,6 +3662,10 @@ sub get_os_version {
              $release .= " ($code_name)" if $code_name;
          }
       }
+      elsif ( -f "/etc/os-release" ) { # openSUSE
+         chomp($release = `grep PRETTY_NAME /etc/os-release`);
+         $release =~ s/^PRETTY_NAME="(.+)"$/$1/;
+      }
       elsif ( `ls /etc/*release 2>/dev/null` ) {
          if ( `grep DISTRIB_DESCRIPTION /etc/*release 2>/dev/null` ) {
             $release = `grep DISTRIB_DESCRIPTION /etc/*release | head -n1`;
diff --git a/bin/pt-duplicate-key-checker b/bin/pt-duplicate-key-checker
index 99d375ae..8905d3fb 100755
--- a/bin/pt-duplicate-key-checker
+++ b/bin/pt-duplicate-key-checker
@@ -3508,6 +3508,10 @@ sub get_os_version {
              $release .= " ($code_name)" if $code_name;
          }
       }
+      elsif ( -f "/etc/os-release" ) { # openSUSE
+         chomp($release = `grep PRETTY_NAME /etc/os-release`);
+         $release =~ s/^PRETTY_NAME="(.+)"$/$1/;
+      }
       elsif ( `ls /etc/*release 2>/dev/null` ) {
          if ( `grep DISTRIB_DESCRIPTION /etc/*release 2>/dev/null` ) {
             $release = `grep DISTRIB_DESCRIPTION /etc/*release | head -n1`;
diff --git a/bin/pt-find b/bin/pt-find
index 975e5b07..3f6280ab 100755
--- a/bin/pt-find
+++ b/bin/pt-find
@@ -2348,6 +2348,10 @@ sub get_os_version {
              $release .= " ($code_name)" if $code_name;
          }
       }
+      elsif ( -f "/etc/os-release" ) { # openSUSE
+         chomp($release = `grep PRETTY_NAME /etc/os-release`);
+         $release =~ s/^PRETTY_NAME="(.+)"$/$1/;
+      }
       elsif ( `ls /etc/*release 2>/dev/null` ) {
          if ( `grep DISTRIB_DESCRIPTION /etc/*release 2>/dev/null` ) {
             $release = `grep DISTRIB_DESCRIPTION /etc/*release | head -n1`;
diff --git a/bin/pt-fk-error-logger b/bin/pt-fk-error-logger
index c2a724e2..171d1266 100755
--- a/bin/pt-fk-error-logger
+++ b/bin/pt-fk-error-logger
@@ -2255,6 +2255,10 @@ sub get_os_version {
              $release .= " ($code_name)" if $code_name;
          }
       }
+      elsif ( -f "/etc/os-release" ) { # openSUSE
+         chomp($release = `grep PRETTY_NAME /etc/os-release`);
+         $release =~ s/^PRETTY_NAME="(.+)"$/$1/;
+      }
       elsif ( `ls /etc/*release 2>/dev/null` ) {
          if ( `grep DISTRIB_DESCRIPTION /etc/*release 2>/dev/null` ) {
             $release = `grep DISTRIB_DESCRIPTION /etc/*release | head -n1`;
diff --git a/bin/pt-heartbeat b/bin/pt-heartbeat
index 439a2f8b..c0007710 100755
--- a/bin/pt-heartbeat
+++ b/bin/pt-heartbeat
@@ -3432,6 +3432,10 @@ sub get_os_version {
              $release .= " ($code_name)" if $code_name;
          }
       }
+      elsif ( -f "/etc/os-release" ) { # openSUSE
+         chomp($release = `grep PRETTY_NAME /etc/os-release`);
+         $release =~ s/^PRETTY_NAME="(.+)"$/$1/;
+      }
       elsif ( `ls /etc/*release 2>/dev/null` ) {
          if ( `grep DISTRIB_DESCRIPTION /etc/*release 2>/dev/null` ) {
             $release = `grep DISTRIB_DESCRIPTION /etc/*release | head -n1`;
diff --git a/bin/pt-index-usage b/bin/pt-index-usage
index 880fd7ac..a7f1cbba 100755
--- a/bin/pt-index-usage
+++ b/bin/pt-index-usage
@@ -5014,6 +5014,10 @@ sub get_os_version {
              $release .= " ($code_name)" if $code_name;
          }
       }
+      elsif ( -f "/etc/os-release" ) { # openSUSE
+         chomp($release = `grep PRETTY_NAME /etc/os-release`);
+         $release =~ s/^PRETTY_NAME="(.+)"$/$1/;
+      }
       elsif ( `ls /etc/*release 2>/dev/null` ) {
          if ( `grep DISTRIB_DESCRIPTION /etc/*release 2>/dev/null` ) {
             $release = `grep DISTRIB_DESCRIPTION /etc/*release | head -n1`;
diff --git a/bin/pt-kill b/bin/pt-kill
index ce7f624b..89cc6d04 100755
--- a/bin/pt-kill
+++ b/bin/pt-kill
@@ -5023,6 +5023,10 @@ sub get_os_version {
              $release .= " ($code_name)" if $code_name;
          }
       }
+      elsif ( -f "/etc/os-release" ) { # openSUSE
+         chomp($release = `grep PRETTY_NAME /etc/os-release`);
+         $release =~ s/^PRETTY_NAME="(.+)"$/$1/;
+      }
       elsif ( `ls /etc/*release 2>/dev/null` ) {
          if ( `grep DISTRIB_DESCRIPTION /etc/*release 2>/dev/null` ) {
             $release = `grep DISTRIB_DESCRIPTION /etc/*release | head -n1`;
diff --git a/bin/pt-online-schema-change b/bin/pt-online-schema-change
index 7a0f5ff6..c63da9c7 100755
--- a/bin/pt-online-schema-change
+++ b/bin/pt-online-schema-change
@@ -6045,6 +6045,10 @@ sub get_os_version {
              $release .= " ($code_name)" if $code_name;
          }
       }
+      elsif ( -f "/etc/os-release" ) { # openSUSE
+         chomp($release = `grep PRETTY_NAME /etc/os-release`);
+         $release =~ s/^PRETTY_NAME="(.+)"$/$1/;
+      }
       elsif ( `ls /etc/*release 2>/dev/null` ) {
          if ( `grep DISTRIB_DESCRIPTION /etc/*release 2>/dev/null` ) {
             $release = `grep DISTRIB_DESCRIPTION /etc/*release | head -n1`;
diff --git a/bin/pt-query-advisor b/bin/pt-query-advisor
index 543353cd..7a2e47ae 100755
--- a/bin/pt-query-advisor
+++ b/bin/pt-query-advisor
@@ -6199,6 +6199,10 @@ sub get_os_version {
              $release .= " ($code_name)" if $code_name;
          }
       }
+      elsif ( -f "/etc/os-release" ) { # openSUSE
+         chomp($release = `grep PRETTY_NAME /etc/os-release`);
+         $release =~ s/^PRETTY_NAME="(.+)"$/$1/;
+      }
       elsif ( `ls /etc/*release 2>/dev/null` ) {
          if ( `grep DISTRIB_DESCRIPTION /etc/*release 2>/dev/null` ) {
             $release = `grep DISTRIB_DESCRIPTION /etc/*release | head -n1`;
diff --git a/bin/pt-query-digest b/bin/pt-query-digest
index 9efe948c..0f097f73 100755
--- a/bin/pt-query-digest
+++ b/bin/pt-query-digest
@@ -12048,6 +12048,10 @@ sub get_os_version {
              $release .= " ($code_name)" if $code_name;
          }
       }
+      elsif ( -f "/etc/os-release" ) { # openSUSE
+         chomp($release = `grep PRETTY_NAME /etc/os-release`);
+         $release =~ s/^PRETTY_NAME="(.+)"$/$1/;
+      }
       elsif ( `ls /etc/*release 2>/dev/null` ) {
          if ( `grep DISTRIB_DESCRIPTION /etc/*release 2>/dev/null` ) {
             $release = `grep DISTRIB_DESCRIPTION /etc/*release | head -n1`;
diff --git a/bin/pt-slave-delay b/bin/pt-slave-delay
index 67e80e46..0626d073 100755
--- a/bin/pt-slave-delay
+++ b/bin/pt-slave-delay
@@ -2664,6 +2664,10 @@ sub get_os_version {
              $release .= " ($code_name)" if $code_name;
          }
       }
+      elsif ( -f "/etc/os-release" ) { # openSUSE
+         chomp($release = `grep PRETTY_NAME /etc/os-release`);
+         $release =~ s/^PRETTY_NAME="(.+)"$/$1/;
+      }
       elsif ( `ls /etc/*release 2>/dev/null` ) {
          if ( `grep DISTRIB_DESCRIPTION /etc/*release 2>/dev/null` ) {
             $release = `grep DISTRIB_DESCRIPTION /etc/*release | head -n1`;
diff --git a/bin/pt-slave-restart b/bin/pt-slave-restart
index 4947d8a0..95717ccd 100755
--- a/bin/pt-slave-restart
+++ b/bin/pt-slave-restart
@@ -3287,6 +3287,10 @@ sub get_os_version {
              $release .= " ($code_name)" if $code_name;
          }
       }
+      elsif ( -f "/etc/os-release" ) { # openSUSE
+         chomp($release = `grep PRETTY_NAME /etc/os-release`);
+         $release =~ s/^PRETTY_NAME="(.+)"$/$1/;
+      }
       elsif ( `ls /etc/*release 2>/dev/null` ) {
          if ( `grep DISTRIB_DESCRIPTION /etc/*release 2>/dev/null` ) {
             $release = `grep DISTRIB_DESCRIPTION /etc/*release | head -n1`;
diff --git a/bin/pt-table-checksum b/bin/pt-table-checksum
index 0f02c634..b3ae71de 100755
--- a/bin/pt-table-checksum
+++ b/bin/pt-table-checksum
@@ -213,6 +213,10 @@ sub get_os_version {
              $release .= " ($code_name)" if $code_name;
          }
       }
+      elsif ( -f "/etc/os-release" ) { # openSUSE
+         chomp($release = `grep PRETTY_NAME /etc/os-release`);
+         $release =~ s/^PRETTY_NAME="(.+)"$/$1/;
+      }
       elsif ( `ls /etc/*release 2>/dev/null` ) {
          if ( `grep DISTRIB_DESCRIPTION /etc/*release 2>/dev/null` ) {
             $release = `grep DISTRIB_DESCRIPTION /etc/*release | head -n1`;
diff --git a/bin/pt-upgrade b/bin/pt-upgrade
index e6f853ad..bf89f9e1 100755
--- a/bin/pt-upgrade
+++ b/bin/pt-upgrade
@@ -10489,6 +10489,10 @@ sub get_os_version {
              $release .= " ($code_name)" if $code_name;
          }
       }
+      elsif ( -f "/etc/os-release" ) { # openSUSE
+         chomp($release = `grep PRETTY_NAME /etc/os-release`);
+         $release =~ s/^PRETTY_NAME="(.+)"$/$1/;
+      }
       elsif ( `ls /etc/*release 2>/dev/null` ) {
          if ( `grep DISTRIB_DESCRIPTION /etc/*release 2>/dev/null` ) {
             $release = `grep DISTRIB_DESCRIPTION /etc/*release | head -n1`;
diff --git a/bin/pt-variable-advisor b/bin/pt-variable-advisor
index ec4ebfb8..1e0a8fca 100755
--- a/bin/pt-variable-advisor
+++ b/bin/pt-variable-advisor
@@ -3576,6 +3576,10 @@ sub get_os_version {
              $release .= " ($code_name)" if $code_name;
          }
       }
+      elsif ( -f "/etc/os-release" ) { # openSUSE
+         chomp($release = `grep PRETTY_NAME /etc/os-release`);
+         $release =~ s/^PRETTY_NAME="(.+)"$/$1/;
+      }
       elsif ( `ls /etc/*release 2>/dev/null` ) {
          if ( `grep DISTRIB_DESCRIPTION /etc/*release 2>/dev/null` ) {
             $release = `grep DISTRIB_DESCRIPTION /etc/*release | head -n1`;
diff --git a/lib/VersionCheck.pm b/lib/VersionCheck.pm
index 280ec809..b59d7a8d 100644
--- a/lib/VersionCheck.pm
+++ b/lib/VersionCheck.pm
@@ -164,6 +164,10 @@ sub get_os_version {
              $release .= " ($code_name)" if $code_name;
          }
       }
+      elsif ( -f "/etc/os-release" ) { # openSUSE
+         chomp($release = `grep PRETTY_NAME /etc/os-release`);
+         $release =~ s/^PRETTY_NAME="(.+)"$/$1/;
+      }
       elsif ( `ls /etc/*release 2>/dev/null` ) {
          if ( `grep DISTRIB_DESCRIPTION /etc/*release 2>/dev/null` ) {
             $release = `grep DISTRIB_DESCRIPTION /etc/*release | head -n1`;