Improving the current release version retrieval mechanism, installer …

…and uninstaller now automatically adds and removes (a symlink) the main pirrot bin to /usr/local/bin to provide simplified access to the pirrot CLI.

VERSION

@@ -0,0 +1 @@
+1.0.6

app/Commands/VersionCommand.php

@@ -14,11 +14,6 @@ class VersionCommand extends BaseCommand implements CommandInterface
 {
     use RecievesArgumentsTrait;
 
-    /**
-     * The Pirrot release/version number.
-     */
-    const PIRROT_VERSION = "1.5.0";
-
     /**
      * The file where the OS information can be retrieved from.
      */
@@ -41,15 +36,22 @@ class VersionCommand extends BaseCommand implements CommandInterface
      */
     private $hardwareVersion = "**not detected**";
 
+    /**
+     * The Pirrot version (release) number.
+     * @var string
+     */
+    private $pirrotVersion = "**not detected**";
+
     /**
      * Handle the command.
      * @return void
      */
     public function handle()
     {
+        $this->detectPirrotVersion();
         $this->detectRaspbianVersion();
         $this->detectHardwareVersion();
-        $this->writeln('Pirrot v' . self::PIRROT_VERSION);
+        $this->writeln('Pirrot v' . $this->pirrotVersion);
         $this->writeln('    - HW version: ' . $this->hardwareVersion);
         $this->writeln('    - OS version: ' . $this->raspbainVersion);
         $this->writeln('    - Compiler version: ' . phpversion() . ' (' . php_uname('v') . ') on ' . php_uname('m'));
@@ -86,6 +88,18 @@ private function detectRaspbianVersion()
         if (isset($versionMatches[1])) {
             $this->raspbainVersion = trim(ucwords($osMatches[1]), '"') . " " . trim($versionMatches[1], '"');
         }
+    }
 
+    /**
+     * Detects the Pirrot release version.
+     * @return void
+     */
+    private function detectPirrotVersion()
+    {
+        $pirrotVersionInfo = '/opt/pirrot/VERSION';
+        if (!file_exists($pirrotVersionInfo)) {
+            return;
+        }
+        $this->pirrotVersion = trim(file_get_contents($pirrotVersionInfo));
     }
 }

build/scripts/install.sh

@@ -50,6 +50,10 @@ fi
 echo " - Setting execution bit on /opt/pirrot/pirrot..."
 sudo chmod +x /opt/pirrot/pirrot
 
+# Make "pirrot" accessible from the PATH...
+sudo ln -s /opt/pirrot/pirrot /usr/local/bin/pirrot
+
+
 # Chmod storage directories
 sudo mkdir /opt/pirrot/storage
 sudo mkdir /opt/pirrot/storage/input

build/scripts/uninstall.sh

@@ -44,6 +44,7 @@ echo "- Running OS specific cleanup..."
 source /opt/pirrot/build/scripts/os_versions/${OS}_${VER_NO}.uninstall
 echo ""
 echo "- Deleting Pirrot application from disk..."
+sudo rm -f /usr/local/bin/pirrot
 sudo rm -Rf /opt/pirrot
 
 echo "Done!"