napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[tracking] Tidy code some more

Browse Source
This commit is contained in:
Adriaan de Groot 2019-08-02 09:19:15 +02:00
parent 8186d5730a
commit d76c33bd3a
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/modules/tracking/TrackingJobs.cpp
View File

@ -124,24 +124,32 @@ TrackingMachineNeonJob::prettyStatusMessage() const
Calamares::JobResult Calamares::JobResult
TrackingMachineNeonJob::exec() TrackingMachineNeonJob::exec()
{ {
int r = CalamaresUtils::System::instance()->targetEnvCall( "/bin/sh", static const auto script = QStringLiteral(
QString(), // Working dir R"x(
QString( MACHINE_ID=`cat /etc/machine-id`
R"x(MACHINE_ID=`cat /etc/machine-id`
sed -i "s,URI =.*,URI = http://releases.neon.kde.org/meta-release/${MACHINE_ID}," /etc/update-manager/meta-release sed -i "s,URI =.*,URI = http://releases.neon.kde.org/meta-release/${MACHINE_ID}," /etc/update-manager/meta-release
sed -i "s,URI_LTS =.*,URI_LTS = http://releases.neon.kde.org/meta-release-lts/${MACHINE_ID}," /etc/update-manager/meta-release sed -i "s,URI_LTS =.*,URI_LTS = http://releases.neon.kde.org/meta-release-lts/${MACHINE_ID}," /etc/update-manager/meta-release
true true
)x" ), )x" );
int r = CalamaresUtils::System::instance()->targetEnvCall( "/bin/sh",
QString(), // Working dir
script,
std::chrono::seconds( 1 ) ); std::chrono::seconds( 1 ) );
if ( r == 0 ) if ( r == 0 )
{
return Calamares::JobResult::ok(); return Calamares::JobResult::ok();
}
else if ( r > 0 ) else if ( r > 0 )
{
return Calamares::JobResult::error( return Calamares::JobResult::error(
tr( "Error in machine feedback configuration." ), tr( "Error in machine feedback configuration." ),
tr( "Could not configure machine feedback correctly, script error %1." ).arg( r ) ); tr( "Could not configure machine feedback correctly, script error %1." ).arg( r ) );
}
else else
{
return Calamares::JobResult::error( return Calamares::JobResult::error(
tr( "Error in machine feedback configuration." ), tr( "Error in machine feedback configuration." ),
tr( "Could not configure machine feedback correctly, Calamares error %1." ).arg( r ) ); tr( "Could not configure machine feedback correctly, Calamares error %1." ).arg( r ) );
}
} }