From ef19c3a5e4a9a0a07400ae28ca69254a7ffc38d1 Mon Sep 17 00:00:00 2001
From: Jakub Klama <jakub@conclusive.pl>
Date: Sat, 29 Feb 2020 21:08:51 +0000
Subject: [PATCH 1/2] Remove hardcoded /home/lumen paths.

---
 mountmon/rebuild | 3 ++-
 rebuild          | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/mountmon/rebuild b/mountmon/rebuild
index e0f14a11..eccd9769 100755
--- a/mountmon/rebuild
+++ b/mountmon/rebuild
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
-MAKEDIR="/home/lumen/Volumetric/LightField/mountmon"
+MOUNTMON_ROOT="${PWD}"
+MAKEDIR="${MOUNTMON_ROOT}"
 BUILDDIR="${MAKEDIR}/build"
 PROJECTFILE="${MAKEDIR}/mountmon.pro"
 
diff --git a/rebuild b/rebuild
index aed69635..39ad5434 100755
--- a/rebuild
+++ b/rebuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-LIGHTFIELD_ROOT=/home/lumen/Volumetric/LightField
+LIGHTFIELD_ROOT="${PWD}"
 
 #########################################################
 ##                                                     ##

From 3fb663a11e670937819269f56cd0a8acf01dc157 Mon Sep 17 00:00:00 2001
From: Jakub Klama <jakub@conclusive.pl>
Date: Sat, 29 Feb 2020 21:09:02 +0000
Subject: [PATCH 2/2] Use sudo -n to avoid interactive input from terminal.

---
 src/upgrademanager.cpp  | 6 +++---
 src/usbmountmanager.cpp | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/upgrademanager.cpp b/src/upgrademanager.cpp
index 8f4d4b54..c2b93237 100644
--- a/src/upgrademanager.cpp
+++ b/src/upgrademanager.cpp
@@ -656,7 +656,7 @@ void UpgradeManager::installUpgradeKit( UpgradeKitInfo const& kit ) {
     QObject::connect   ( _processRunner, &ProcessRunner::succeeded, this, &UpgradeManager::aptGetUpdate_succeeded );
     QObject::connect   ( _processRunner, &ProcessRunner::failed,    this, &UpgradeManager::aptGetUpdate_failed    );
 
-    _processRunner->start( { "sudo" }, { "apt-get", "-y", "update", } );
+    _processRunner->start( { "sudo" }, { "-n", "apt-get", "-y", "update", } );
 }
 
 void UpgradeManager::aptGetUpdate_succeeded( ) {
@@ -671,7 +671,7 @@ void UpgradeManager::aptGetUpdate_succeeded( ) {
         releaseTrain = '-' % _kitToInstall->releaseTrain;
     }
 
-    QStringList processArgs { "apt-get", "-y", "install", };
+    QStringList processArgs { "-n", "apt-get", "-y", "install", };
     if ( _kitToInstall->version < LIGHTFIELD_VERSION_CODE ) {
         processArgs.append( "--allow-downgrades" );
     } else if ( _kitToInstall->version == LIGHTFIELD_VERSION_CODE ) {
@@ -713,7 +713,7 @@ void UpgradeManager::aptGetInstall_succeeded( ) {
     QObject::connect   ( _processRunner, &ProcessRunner::succeeded, this, &UpgradeManager::aptGetDistUpgrade_succeeded );
     QObject::connect   ( _processRunner, &ProcessRunner::failed,    this, &UpgradeManager::aptGetDistUpgrade_failed    );
 
-    _processRunner->start( { "sudo" }, { "apt-get", "-y", "dist-upgrade", } );
+    _processRunner->start( { "sudo" }, { "-n", "apt-get", "-y", "dist-upgrade", } );
 }
 
 void UpgradeManager::aptGetInstall_failed( int const exitCode, QProcess::ProcessError const error ) {
diff --git a/src/usbmountmanager.cpp b/src/usbmountmanager.cpp
index 56a51aee..9d1cc12a 100644
--- a/src/usbmountmanager.cpp
+++ b/src/usbmountmanager.cpp
@@ -24,7 +24,7 @@ UsbMountManager::UsbMountManager( QObject* parent ): QObject( parent ) {
     QObject::connect( _processRunner, &ProcessRunner::readyReadStandardOutput, _stdoutLogger, &StdioLogger::read                                 );
     QObject::connect( _processRunner, &ProcessRunner::readyReadStandardOutput, this,          &UsbMountManager::mountmon_readyReadStandardOutput );
 
-    _processRunner->start( QString { "sudo" }, QStringList { MountmonCommand } );
+    _processRunner->start( QString { "sudo" }, QStringList { "-n", MountmonCommand } );
 }
 
 UsbMountManager::~UsbMountManager( ) {