Skip to content
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.

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

Really stick to new nomenclature, plus … #337

Merged
merged 16 commits into from
Jan 17, 2023
2 changes: 1 addition & 1 deletion .github/workflows/ci_sfos3.4.0-armv7hl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
build:
runs-on: ubuntu-22.04
env:
SEGMENT_DOWNLOAD_TIMEOUT_MINS: 3
SEGMENT_DOWNLOAD_TIMEOUT_MINS: 1
steps:
- name: Checkout
uses: actions/checkout@v3
Expand Down
17 changes: 11 additions & 6 deletions src/bin/patchmanager-daemon/main.cpp
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
/*
* Copyright (C) 2013 Lucien XU <[email protected]>
* Copyright (C) 2016 Andrey Kozhevnikov <[email protected]>
* Copyright (c) 2021, Patchmanager for SailfishOS contributors:
* - olf "Olf0" <https://github.com/Olf0>
* - Peter G. "nephros" <[email protected]>
* - Vlad G. "b100dian" <https://github.com/b100dian>
*
* You may use this file under the terms of the BSD license as follows:
* You may use this file under the terms of the 3-clause BSD license,
* as follows:
*
* "Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
Expand Down Expand Up @@ -48,11 +53,11 @@ void help()
std::cout << "patchmanager" << std::endl;
std::cout << std::endl;
std::cout << "Usage:" << std::endl;
std::cout << " patchmanager : run as daemon" << std::endl;
std::cout << " patchmanager -a <patch> : apply a patch" << std::endl;
std::cout << " patchmanager -u <patch> : unapply a patch" << std::endl;
std::cout << " patchmanager --unapply-all : unapply all patches" << std::endl;
std::cout << " patchmanager --daemon : daemonize" << std::endl;
std::cout << " patchmanager : Run Patchmanager as daemon" << std::endl;
std::cout << " patchmanager -a <Patch> : Enable and activate a Patch" << std::endl;
std::cout << " patchmanager -u <Patch> : Deactivate and disable (unapply) a Patch" << std::endl;
std::cout << " patchmanager --unapply-all : Deactivate and disable (unapply) all Patches" << std::endl;
std::cout << " patchmanager --daemon : Daemonize Patchmanager" << std::endl;
}

int main(int argc, char **argv)
Expand Down
4 changes: 2 additions & 2 deletions src/bin/patchmanager-daemon/patch/patch.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Unapply all patches on Upgrade",
"description": "Patch for unapplying all patches when upgrading SailfishOS version. Do not unapply this patch manually, unless you want to completely uninstall Patchmanager.",
"name": "Deactivate and disable (unapply) all Patches on upgrade",
"description": "Patch for unapplying all Patches when upgrading SailfishOS. Do not unapply this Patch manually, unless you want to remove (uninstall) Patchmanager completely.",
"category": "settings",
"infos": {
"maintainer": "coderus"
Expand Down
12 changes: 6 additions & 6 deletions src/bin/patchmanager-daemon/patchmanagerobject.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ void PatchManagerObject::notify(const QString &patch, NotifyAction action)
break;
case NotifyActionSuccessUnapply:
summary = qApp->translate("", "Patch deactivated");
body = qApp->translate("", "Patch %1 deactivated.").arg(patch);
body = qApp->translate("", "Patch %1 is now inactive.").arg(patch);
if (getToggleServices()) {
body.append( ", " );
body.append( qApp->translate("", "some service(s) should be restarted.") );
Expand Down Expand Up @@ -333,7 +333,7 @@ void PatchManagerObject::lateInitialize()

QFile file (AUSMT_INSTALLED_LIST_FILE);
if (file.exists()) {
qWarning() << Q_FUNC_INFO << "Found extant AUSMT package list, importing list as Patches marked active.";
qWarning() << Q_FUNC_INFO << "Found extant AUSMT package list, importing list as enabled Patches.";
if (file.open(QFile::ReadOnly)) {
while (!file.atEnd()) {
const QString line = QString::fromLatin1(file.readLine());
Expand Down Expand Up @@ -1374,7 +1374,7 @@ void PatchManagerObject::lipstickChanged(const QString &state)
qDebug() << Q_FUNC_INFO << state;

if (!getLoaded() && !m_failed && !getSettings(QStringLiteral("applyOnBoot"), false).toBool()) {
qDebug() << Q_FUNC_INFO << "Automatically activating all Patches marked active after SailfishOS booted.";
qDebug() << Q_FUNC_INFO << "Automatically activate all enabled Patches when SailfishOS starts.";
QTimer::singleShot(20000, this, [this](){
QDBusMessage showPatcher = QDBusMessage::createMethodCall(QStringLiteral("org.SfietKonstantin.patchmanager"),
QStringLiteral("/"),
Expand Down Expand Up @@ -1451,10 +1451,10 @@ void PatchManagerObject::onLipstickChanged(const QString &, const QVariantMap &c
const QString activeState = changedProperties.value(QStringLiteral("ActiveState"), QStringLiteral("unknown")).toString();
qDebug() << Q_FUNC_INFO << activeState;
if (activeState == QStringLiteral("failed")) {
qInfo() << Q_FUNC_INFO << "Detected lipstick crash, hence deactivating all Patches.";
qInfo() << Q_FUNC_INFO << "Detected lipstick crash, hence deactivating and disabling all Patches.";
unapplyAllPatches();
} else if (activeState == QStringLiteral("active") && !getLoaded() && !m_failed && !getSettings(QStringLiteral("applyOnBoot"), false).toBool()) {
qInfo() << Q_FUNC_INFO << "Automatically activating all Patches marked active.";
qInfo() << Q_FUNC_INFO << "Automatically activating all enabled Patches.";
QTimer::singleShot(5000, this, [this](){
QDBusMessage showPatcher = QDBusMessage::createMethodCall(QStringLiteral("org.SfietKonstantin.patchmanager"),
QStringLiteral("/"),
Expand All @@ -1471,7 +1471,7 @@ void PatchManagerObject::onOsUpdateProgress(int progress)
return;
}

qInfo() << Q_FUNC_INFO << "Detected SailfishOS update in progress, hence deactivating all Patches.";
qInfo() << Q_FUNC_INFO << "Detected SailfishOS update in progress, hence deactivating and disabling all Patches.";
unapplyAllPatches();
}

Expand Down
2 changes: 1 addition & 1 deletion src/qml/PatchManagerPage.qml
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ Page {
*/

MenuItem {
text: qsTranslate("", "Deactivate all Patches")
text: qsTranslate("", "Disable and deactivate all Patches")
onClicked: menuRemorse.execute( text, function() { PatchManager.call(PatchManager.unapplyAllPatches()) } )
visible: uisettings.showUnapplyAll
}
Expand Down
8 changes: 4 additions & 4 deletions src/qml/SettingsPage.qml
Original file line number Diff line number Diff line change
Expand Up @@ -90,16 +90,16 @@ Page {
}

TextSwitch {
text: qsTranslate("", "Activate Patches when booting")
text: qsTranslate("", "Activate enabled Patches when booting")
description: qsTranslate("", "Automatically activate all enabled Patches when SailfishOS starts.")
checked: PatchManager.applyOnBoot
onClicked: PatchManager.applyOnBoot = !PatchManager.applyOnBoot
automaticCheck: false
}

TextSwitch {
text: qsTranslate("", "Show 'Deactivate all Patches' pulley menu entry")
description: qsTranslate("", "Enable an additional pulley menu entry for Patchmanager's main page to deactivate all Patches.")
text: qsTranslate("", "Show 'Disable and deactivate all Patches' pulley menu entry")
description: qsTranslate("", "Enable an additional pulley menu entry for Patchmanager's main page to disable and deactivate all Patches.")
checked: uisettings.showUnapplyAll
onClicked: uisettings.showUnapplyAll = !uisettings.showUnapplyAll
automaticCheck: false
Expand All @@ -114,7 +114,7 @@ Page {
left: parent.left
}
label: qsTranslate("", "Version Check") + ":"
description: qsTranslate("", "Enable activating Patches, which are not marked as compatible with the installed SailfishOS version. Note that Patches, which are actually incompatible, will not work.")
description: qsTranslate("", "Allows to enable Patches, which are not marked as compatible with the installed SailfishOS version. Note that Patches, which are actually incompatible, will not work.")
onCurrentIndexChanged: PatchManager.sfosVersionCheck = currentIndex
currentIndex: (PatchManager.sfosVersionCheck) ? PatchManager.sfosVersionCheck : VersionCheck.Strict
menu: ContextMenu {
Expand Down
14 changes: 7 additions & 7 deletions src/tools/pm_apply
Original file line number Diff line number Diff line change
Expand Up @@ -78,13 +78,13 @@ test_if_applied() {
fi
}

# see issue #71: https://github.com/sailfishos-patches/patchmanager/issues/71
# For details see issue #71: https://github.com/sailfishos-patches/patchmanager/issues/71
mangle_libpath() {
if [ -f "$PATCH_PATH" ]; then
log
log "----------------------------------"
[ $SYS_BITNESS -eq 32 ] && log "Checking paths for 32->64bit conversion"
[ $SYS_BITNESS -eq 64 ] && log "Checking paths for 64->32bit conversion"
[ $SYS_BITNESS -eq 32 ] && log "Checking paths for 32-bit --> 64-bit conversion"
[ $SYS_BITNESS -eq 64 ] && log "Checking paths for 64-bit --> 32-bit conversion"
log "----------------------------------"
log

Expand Down Expand Up @@ -149,7 +149,7 @@ verify_text_patch() {
if [ -f "$PATCH_PATH" ]; then
log
log "----------------------------------"
log "Dry running patch"
log "Dry running patch file"
log "----------------------------------"
log

Expand All @@ -164,7 +164,7 @@ install_text_patch() {
if [ -f "$PATCH_PATH" ]; then
log
log "----------------------------------"
log "Applying text patch"
log "Applying patch file"
log "----------------------------------"
log

Expand All @@ -175,7 +175,7 @@ install_text_patch() {
create_backup_patch() {
log
log "----------------------------------"
log "Creating backup patch"
log "Creating backup of patch file"
log "----------------------------------"
log

Expand Down Expand Up @@ -204,7 +204,7 @@ log "----------------------------------"
log

if [ -z "$PARAMETER" ]; then
log "ERROR: A parameter must be provided for applying!"
log "ERROR: A parameter must be provided for the pm_apply script!"
failure
fi

Expand Down
6 changes: 3 additions & 3 deletions src/tools/pm_unapply
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ remove_text_patch() {
if [ -f "$PATCH_FILE" ]; then
log
log "----------------------------------"
log "Unapplying text patch"
log "Reverting (unapplying) applied patch file"
log "----------------------------------"
log

Expand All @@ -93,7 +93,7 @@ remove_text_patch() {
clean_backup_patch() {
log
log "----------------------------------"
log "Cleaning backup patch"
log "Deleting backup of patch file"
log "----------------------------------"
log

Expand All @@ -117,7 +117,7 @@ log "----------------------------------"
log

if [ -z "$PARAMETER" ]; then
log "ERROR: A parameter must be provided for unapplying!"
log "ERROR: A parameter must be provided for the pm_unapply script!"
failure
fi

Expand Down