Skip to content

Misc fixes #94

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jceel wants to merge 2 commits into
base: dev-1.0.12
Choose a base branch
from
Open

Misc fixes #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef19c3a
Remove hardcoded /home/lumen paths.
Feb 29, 2020
3fb663a
Use sudo -n to avoid interactive input from terminal.
Feb 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion mountmon/rebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
2 changes: 1 addition & 1 deletion rebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

LIGHTFIELD_ROOT=/home/lumen/Volumetric/LightField
LIGHTFIELD_ROOT="${PWD}"

#########################################################
## ##
Expand Down
6 changes: 3 additions & 3 deletions src/upgrademanager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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( ) {
Expand All @@ -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 ) {
Expand Down Expand Up @@ -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 ) {
Expand Down
2 changes: 1 addition & 1 deletion src/usbmountmanager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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( ) {
Expand Down