diff --git a/Makefile b/Makefile
index ac8764d..a6e47ae 100644
--- a/Makefile
+++ b/Makefile
@@ -53,7 +53,6 @@ initrddir = ${sysconfdir}/rc.d/init.d
mandir = ${prefix}/usr/share/man
sysconfigdir= ${sysconfdir}/sysconfig
profiledir = ${sysconfdir}/profile.d
-mambabasedatadir = ${datadir}/openmamba/mambabase
mambareportdatadir = ${datadir}/openmamba/mambareport
mambaimagesdir = ${datadir}/openmamba/images
iconsdir = ${datadir}/icons/hicolor
@@ -89,8 +88,7 @@ distdir = $(PACKAGE)-$(VERSION)
dist_archive = $(distdir).tar.bz2
pck_desktop := $(wildcard desktop/*.tar.bz2)
-pck_catalogs := $(wildcard mambabase/po/*.po)
-pck_catalogs1 := $(wildcard openmamba-update/po/*.po)
+pck_catalogs := $(wildcard openmamba-update/po/*.po)
.SUFFIXES:
.SUFFIXES: .in .po .mo
@@ -119,24 +117,16 @@ dist-update: $(pck_infiles:.in=)
.po.mo:; msgfmt $< -o $@
-locales: $(pck_catalogs:.po=.mo) $(pck_catalogs1:.po=.mo)
+locales: $(pck_catalogs:.po=.mo)
install-locales: locales
@for f in $(pck_catalogs); do\
- lang=`echo $$f | sed 's,.*/\(.*\)\.po,\1,'`;\
- echo "installing i18n file for language \`$$lang'...";\
- dir="$(DESTDIR)$(datadir)/locale/$$lang/LC_MESSAGES";\
- $(INSTALL_DIR) $$dir;\
- $(INSTALL_DATA) $${f/.po/.mo} $$dir/mambabase.mo;\
- done
- @for f in $(pck_catalogs1); do\
lang=`echo $$f | sed 's,.*/\(.*\)\.po,\1,'`;\
echo "installing i18n file for language \`$$lang'...";\
dir="$(DESTDIR)$(datadir)/locale/$$lang/LC_MESSAGES";\
$(INSTALL_DIR) $$dir;\
$(INSTALL_DATA) $${f/.po/.mo} $$dir/openmamba-update.mo;\
done
- @lrelease-qt5 mambabase/mambabase_it.ts -qm $(DESTDIR)$(datadir)/locale/it/LC_MESSAGES/mambabase.qm
install-kde-distro-addons: dist-update
@$(INSTALL_DIR) $(DESTDIR)$(sysconfdir)
@@ -181,23 +171,7 @@ install-srpms:
install-icons:
@$(INSTALL_DIR) $(DESTDIR)$(systemlogodir)/; \
- $(INSTALL_DATA) mambabase/mamba-64x64.png $(DESTDIR)$(systemlogodir)/system-logo-white.png
- @for i in 16x16 22x22 32x32 48x48 64x64 128x128; do \
- $(INSTALL_DIR) $(DESTDIR)$(iconsdir)/$$i/apps/; \
- $(INSTALL_DATA) mambabase/mamba-$$i.png $(DESTDIR)$(iconsdir)/$$i/apps/mamba.png; \
- done
-
-install-mambabase:
- @$(INSTALL_DIR) $(DESTDIR)$(mambabasedatadir)
- $(INSTALL_SCRIPT) mambabase/mambabase $(DESTDIR)$(bindir)/mambabase
- $(INSTALL_SCRIPT) mambabase/mambabase.py $(DESTDIR)$(mambabasedatadir)
- $(INSTALL_SCRIPT) mambabase/mambabase-pkggroups-parser.sh $(DESTDIR)$(mambabasedatadir)
- $(INSTALL_SCRIPT) mambabase/nvidia-autoselect-driver $(DESTDIR)$(mambabasedatadir)
- $(INSTALL_DATA) mambabase/mambabase.desktop $(DESTDIR)$(xdg_appsdir)
- $(INSTALL_DATA) mambabase/mambabase-autostart.desktop $(DESTDIR)$(mambabasedatadir)
- $(INSTALL_DATA) mambabase/openmamba.png $(DESTDIR)$(mambabasedatadir)
- $(INSTALL_DATA) mambabase/mambabase.png $(DESTDIR)$(mambabasedatadir)
- cp mambabase/*.ui $(DESTDIR)$(mambabasedatadir)
+ $(INSTALL_DATA) menu/icons/hicolor/128x128/apps/openmamba.png $(DESTDIR)$(systemlogodir)/system-logo-white.png
install-mambareport:
$(INSTALL_SCRIPT) mambareport/openmamba-makereport $(DESTDIR)$(bindir)
@@ -223,13 +197,11 @@ install: $(pck_infiles:.in=) \
install-srpms \
install-desktop \
install-openmamba-update \
- install-mambabase \
install-mambareport \
install-locales \
install-icons
dist: clean
- @git log > ChangeLog.git
@mkdir /tmp/$(distdir)
@cp -a * /tmp/$(distdir)/
@rm -f $(dist_archive);\
@@ -246,4 +218,3 @@ clean:
rm -f $(dist_archive)
rm -f $(patsubst %.in,%,$(pck_infiles))
rm -f $(pck_catalogs:.po=.mo)
- rm -f $(pck_catalogs1:.po=.mo)
diff --git a/mambabase/FinishPage.ui b/mambabase/FinishPage.ui
deleted file mode 100644
index aefc13f..0000000
--- a/mambabase/FinishPage.ui
+++ /dev/null
@@ -1,118 +0,0 @@
-
-
- Form
-
-
-
- 0
- 0
- 552
- 392
-
-
-
-
- 0
- 0
-
-
-
- Form
-
-
-
-
- 0
- 0
- 551
- 391
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- background-color: rgb(239, 240, 241);
-background-color: rgb(255, 255, 255);
-
-
- QFrame::StyledPanel
-
-
- QFrame::Raised
-
-
-
-
- 10
- 10
- 511
- 31
-
-
-
- <html><head/><body><p align="center"><span style=" font-size:14pt; font-weight:600;">Installation completed.</span></p></body></html>
-
-
- true
-
-
-
-
-
- 26
- 130
- 501
- 21
-
-
-
-
-
-
-
-
-
- 20
- 100
- 511
- 271
-
-
-
- QFrame::StyledPanel
-
-
- QFrame::Raised
-
-
-
-
-
- 20
- 40
- 511
- 51
-
-
-
- <html><head/><body><p>If you ran into problems, please check the installation log below for warnings or errors and send the report to the openmamba community at <a href="https://openmamba.org"><span style=" text-decoration: underline; color:#2980b9;">openmamba.org</span></a>.</p></body></html>
-
-
- true
-
-
-
-
-
-
-
-
-
-
diff --git a/mambabase/InstallationPage.ui b/mambabase/InstallationPage.ui
deleted file mode 100644
index e65b92a..0000000
--- a/mambabase/InstallationPage.ui
+++ /dev/null
@@ -1,144 +0,0 @@
-
-
- Form
-
-
-
- 0
- 0
- 552
- 392
-
-
-
-
- 0
- 0
-
-
-
- Form
-
-
-
-
- 0
- 0
- 551
- 391
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- background-color: rgb(239, 240, 241);
-background-color: rgb(255, 255, 255);
-
-
- QFrame::StyledPanel
-
-
- QFrame::Raised
-
-
-
-
- 10
- 10
- 521
- 31
-
-
-
- <html><head/><body><p align="center"><span style=" font-size:14pt; font-weight:600;">Installation in progress...</span></p></body></html>
-
-
- true
-
-
-
-
-
- 20
- 50
- 511
- 41
-
-
-
- 0
-
-
-
-
-
- 20
- 90
- 511
- 21
-
-
-
-
-
-
-
-
-
- 20
- 130
- 511
- 241
-
-
-
- QFrame::StyledPanel
-
-
- QFrame::Raised
-
-
-
-
- 10
- 30
- 491
- 201
-
-
-
-
-
-
- false
-
-
-
-
-
- 10
- 10
- 481
- 20
-
-
-
- <html><head/><body><p><span style=" font-weight:600;">Installation details:</span></p></body></html>
-
-
-
-
-
-
-
-
-
-
-
diff --git a/mambabase/SelectExtraPage.ui b/mambabase/SelectExtraPage.ui
deleted file mode 100644
index 729a593..0000000
--- a/mambabase/SelectExtraPage.ui
+++ /dev/null
@@ -1,170 +0,0 @@
-
-
- Form
-
-
-
- 0
- 0
- 552
- 392
-
-
-
-
- 0
- 0
-
-
-
- Form
-
-
-
-
- 0
- 0
- 551
- 391
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- background-color: rgb(239, 240, 241);
-background-color: rgb(255, 255, 255);
-
-
- QFrame::StyledPanel
-
-
- QFrame::Raised
-
-
-
-
- 10
- 10
- 511
- 31
-
-
-
- <html><head/><body><p><span style=" font-weight:600;">Please, select from the boxes below the components that you want to install or update from network.</span></p></body></html>
-
-
- true
-
-
-
-
-
- 10
- 50
- 531
- 331
-
-
-
- background-color: rgb(239, 240, 241);
-
-
- Proprietary software installations/updates
-
-
-
-
- 20
- 140
- 491
- 21
-
-
-
- NVIDIA proprietary video driver (autodetected) from openmamba.org
-
-
- false
-
-
-
-
-
- 20
- 190
- 491
- 21
-
-
-
- Broadcom-sta proprietary wireless driver from openmamba.org
-
-
-
-
-
- 20
- 240
- 491
- 21
-
-
-
- Broadcom B43 proprietary firmware from openwrt.org
-
-
-
-
-
- 20
- 290
- 491
- 21
-
-
-
- MS TrueType core fonts from sourceforge
-
-
-
-
-
- 20
- 90
- 491
- 21
-
-
-
- VirtualBox extension pack from virtualbox.org
-
-
-
-
-
- 20
- 40
- 491
- 21
-
-
-
- Widevine extension from google.com
-
-
-
-
-
-
-
-
-
-
-
diff --git a/mambabase/SelectGroupsPage.ui b/mambabase/SelectGroupsPage.ui
deleted file mode 100644
index 579bd29..0000000
--- a/mambabase/SelectGroupsPage.ui
+++ /dev/null
@@ -1,209 +0,0 @@
-
-
- Form
-
-
-
- 0
- 0
- 552
- 392
-
-
-
-
- 0
- 0
-
-
-
- Form
-
-
-
-
- 0
- 0
- 551
- 391
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- background-color: rgb(239, 240, 241);
-background-color: rgb(255, 255, 255);
-
-
- QFrame::StyledPanel
-
-
- QFrame::Raised
-
-
-
-
- 10
- 10
- 511
- 31
-
-
-
- <html><head/><body><p><span style=" font-weight:600;">Please, select from the boxes below the components that you want to install or update from network.</span></p></body></html>
-
-
- true
-
-
-
-
-
- 10
- 50
- 531
- 331
-
-
-
- background-color: rgb(239, 240, 241);
-
-
- openmamba installations/updates
-
-
-
-
- 20
- 40
- 491
- 21
-
-
-
- System base packages (recommended)
-
-
- true
-
-
-
-
-
- 20
- 70
- 491
- 21
-
-
-
- Office packages (OpenOffice, ...)
-
-
-
-
-
- 20
- 100
- 491
- 21
-
-
-
- Audio and Video players (VLC, kaffeine, ...)
-
-
-
-
-
- 20
- 130
- 491
- 21
-
-
-
- Multimedia editing and production (kino, audacity, rosegarden, mixxx, ...)
-
-
-
-
-
- 20
- 160
- 491
- 21
-
-
-
- Internet communication and p2p
-
-
-
-
-
- 20
- 190
- 491
- 21
-
-
-
- Graphics software (gimp, digikam, blender, krita)
-
-
-
-
-
- 20
- 250
- 491
- 21
-
-
-
- Emulation and virtualization (VirtualBox, wine)
-
-
-
-
-
- 20
- 280
- 491
- 21
-
-
-
- Base server packages (Apache, PHP, MariaDB, ...)
-
-
-
-
-
- 20
- 220
- 491
- 21
-
-
-
- Games (tuxracer, pingus, ksudoku, ...)
-
-
-
-
-
-
-
-
-
-
-
diff --git a/mambabase/WelcomePage.ui b/mambabase/WelcomePage.ui
deleted file mode 100644
index 254affa..0000000
--- a/mambabase/WelcomePage.ui
+++ /dev/null
@@ -1,183 +0,0 @@
-
-
- Form
-
-
-
- 0
- 0
- 552
- 380
-
-
-
-
- 0
- 0
-
-
-
- Form
-
-
-
-
- 0
- 0
- 551
- 381
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
- 0
- 160
-
-
-
- background-color: rgb(255, 255, 255);
-
-
- QFrame::Box
-
-
- QFrame::Raised
-
-
-
-
- 20
- 10
- 491
- 61
-
-
-
-
- 0
- 0
-
-
-
-
-
-
- openmamba.png
-
-
- Qt::AlignCenter
-
-
-
-
-
- 10
- 80
- 531
- 72
-
-
-
-
-
-
-
- <html><head/><body><p><span style=" font-style:italic;">mambabase - Copyright (c) 2007-2021 by Silvan Calarco<br/>Released under the terms of the GNU GPL v3 license</span></p></body></html>
-
-
- Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter
-
-
-
- -
-
-
- <html><head/><body><p><a href="https://openmamba.org"><span style=" text-decoration: underline; color:#2980b9;">openmamba.org</span></a></p></body></html>
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
-
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- background-color: rgb(239, 240, 241);
-
-
- QFrame::StyledPanel
-
-
- QFrame::Raised
-
-
-
-
- 10
- 10
- 511
- 131
-
-
-
- <html><head/><body><p>This program will complete the installation by adding the minimum recommended set of packages to the system. Additionally it will let you install, upon selection, macro-group of packages and proprietary software components.</p><p><span style=" font-weight:600;">TIP</span>: you may run this program at any time from the <span style=" font-style:italic;">openmamba control center</span> on the tray icon bar.</p></body></html>
-
-
- Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
-
-
- true
-
-
-
-
-
- 10
- 180
- 531
- 20
-
-
-
- <html><head/><body><p><br/></p></body></html>
-
-
-
-
-
- 10
- 150
- 531
- 23
-
-
-
- 0
-
-
-
-
-
-
-
-
-
-
diff --git a/mambabase/mamba-128x128.png b/mambabase/mamba-128x128.png
deleted file mode 100644
index 7951ee3..0000000
Binary files a/mambabase/mamba-128x128.png and /dev/null differ
diff --git a/mambabase/mamba-16x16.png b/mambabase/mamba-16x16.png
deleted file mode 100644
index 9b66b49..0000000
Binary files a/mambabase/mamba-16x16.png and /dev/null differ
diff --git a/mambabase/mamba-22x22.png b/mambabase/mamba-22x22.png
deleted file mode 100644
index 6aee518..0000000
Binary files a/mambabase/mamba-22x22.png and /dev/null differ
diff --git a/mambabase/mamba-32x32.png b/mambabase/mamba-32x32.png
deleted file mode 100644
index ea54640..0000000
Binary files a/mambabase/mamba-32x32.png and /dev/null differ
diff --git a/mambabase/mamba-48x48.png b/mambabase/mamba-48x48.png
deleted file mode 100644
index 787b10f..0000000
Binary files a/mambabase/mamba-48x48.png and /dev/null differ
diff --git a/mambabase/mamba-64x64.png b/mambabase/mamba-64x64.png
deleted file mode 100644
index 6f2ec5a..0000000
Binary files a/mambabase/mamba-64x64.png and /dev/null differ
diff --git a/mambabase/mambabase b/mambabase/mambabase
deleted file mode 100755
index 11ad53e..0000000
--- a/mambabase/mambabase
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-/usr/bin/python3 /usr/share/openmamba/mambabase/mambabase.py
diff --git a/mambabase/mambabase-autostart.desktop b/mambabase/mambabase-autostart.desktop
deleted file mode 100755
index a5069b4..0000000
--- a/mambabase/mambabase-autostart.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env xdg-open
-[Desktop Entry]
-Name=mambabase
-GenericName=openmamba components installer
-GenericName[it]=Installazione componenti base di openmamba
-Exec=/usr/bin/mambabase
-Icon=mamba
-Terminal=0
-Type=Application
-Categories=X-openmamba;
-#X-KDE-RootOnly=true
-#X-KDE-SubstituteUID=true
-#X-KDE-Username=root
diff --git a/mambabase/mambabase-pkggroups-parser.sh b/mambabase/mambabase-pkggroups-parser.sh
deleted file mode 100755
index 42c0ad6..0000000
--- a/mambabase/mambabase-pkggroups-parser.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-. /usr/share/openmamba/pkggroups.db
-
-echo kernel_mamba=$KERNEL_MAMBA_PKGS
-echo kernel_mamba_64gb=$KERNEL_MAMBA_64GB_PKGS
-echo kernel_mamba_x86_64=$KERNEL_MAMBA_X86_64_PKGS
-echo kernel_mamba_arm=$KERNEL_MAMBA_ARM_PKGS
-echo base=$BASE_PKGS
-echo base_extras=$BASE_PKGS_EXTRAS
-echo office=$OFFICE_PKGS
-echo office_extras=$OFFICE_EXTRA_PKGS
-echo multimedia_players=$MULTIMEDIA_PLAYERS_PKGS
-echo multimedia_players_extras=$MULTIMEDIA_PLAYERS_EXTRA_PKGS
-echo multimedia_editing=$MULTIMEDIA_EDITING_PKGS
-echo multimedia_editing_extras=$MULTIMEDIA_EDITING_EXTRA_PKGS
-echo audio=$AUDIO_PKGS
-echo audio_prof=$AUDIO_PROF_PKGS
-echo video=$VIDEO_PKGS
-echo internet=$INTERNET_PKGS
-echo internet_extra=$INTERNET_EXTRA_PKGS
-echo graphics=$GRAPHICS_PKGS
-echo graphics_extras=$GRAPHICS_EXTRA_PKGS
-echo scientific=$SCIENTIFIC_PKGS
-echo games=$GAMES_PKGS
-echo games_extra=$GAMES_EXTRA_PKGS
-echo virtualization=$VIRTUALIZATION_PKGS
-echo server=$SERVER_PKGS
-echo devel=$DEVEL_PKGS
diff --git a/mambabase/mambabase.desktop b/mambabase/mambabase.desktop
deleted file mode 100644
index ad87487..0000000
--- a/mambabase/mambabase.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Name=openmamba base components
-Name[it]=Componenti base di openmamba
-GenericName=openmamba base components installer
-GenericName[it]=Installazione dei componenti base di openmamba
-Exec=/usr/bin/mambabase
-Icon=mamba
-Terminal=0
-Type=Application
-Categories=X-openmamba;
-#X-KDE-RootOnly=true
-#X-KDE-SubstituteUID=true
-#X-KDE-Username=root
diff --git a/mambabase/mambabase.png b/mambabase/mambabase.png
deleted file mode 100644
index 7951ee3..0000000
Binary files a/mambabase/mambabase.png and /dev/null differ
diff --git a/mambabase/mambabase.py b/mambabase/mambabase.py
deleted file mode 100755
index b8c99e9..0000000
--- a/mambabase/mambabase.py
+++ /dev/null
@@ -1,367 +0,0 @@
-#!/usr/bin/env python3
-# Copyright (c) 2019-2021 by Silvan Calarco
-# Release under the terms of the GPL version 3 license
-
-from PyQt5 import QtGui, QtCore, QtWidgets, uic
-from PyQt5.QtCore import pyqtProperty
-from PyQt5.QtCore import QLocale, QTranslator
-from pathlib import Path
-import gettext
-import subprocess
-import os
-
-import gi
-gi.require_version('PackageKitGlib', '1.0')
-from gi.repository import PackageKitGlib as packagekit
-
-DATADIR = os.path.dirname(os.path.realpath((__file__))) + "/"
-
-
-class MambabaseWizard(QtWidgets.QWizard):
- def __init__(self, parent=None):
- super(MambabaseWizard, self).__init__(parent)
- self.welcomePage = WelcomePage(self)
- self.addPage(self.welcomePage)
- self.selectGroupsPage = SelectGroupsPage(self)
- self.addPage(self.selectGroupsPage)
- self.selectExtraPage = SelectExtraPage(self)
- self.addPage(self.selectExtraPage)
- self.installationPage = InstallationPage(self)
- self.addPage(self.installationPage)
- self.setWindowTitle(_("openmamba base network installations") +
- " - openmamba.org")
- self.setFixedSize(571,465)
- self.currentIdChanged.connect(self.currentIdChangedSlot)
- self.prepareThread = PrepareThread(self)
- self.installThread = InstallThread(self, self.selectGroupsPage.pkggroups)
-
- def currentIdChangedSlot(self, currentId):
- if currentId == 0:
- self.prepareThread.start()
- elif currentId == 3:
- self.installThread.start()
-
-
-class PrepareThread(QtCore.QThread):
- parent = None
- doneSignal = QtCore.pyqtSignal()
- updateProgressSignal = QtCore.pyqtSignal(dict)
-
- def __init__(self, parent=None):
- super(PrepareThread, self).__init__(parent)
- self.parent = parent
- self.doneSignal.connect(parent.welcomePage.completeChanged)
- self.updateProgressSignal.connect(
- parent.welcomePage.updateProgressSlot)
-
- def run(self):
- # Update packages list
- self.updateProgressSignal.emit({ 'value': 5,
- 'label': _("Checking installed packages...")})
- self.parent.selectGroupsPage.loadPkgGroups()
- self.updateProgressSignal.emit({ 'value': 55,
- 'label': _("Checking installed extra components...")})
- self.parent.selectExtraPage.setExtras()
- self.updateProgressSignal.emit({ 'value': 100,
- 'label': _("Done. Please, press the Next button to continue.")})
- # Enable back and next buttons
- self.parent.welcomePage.done = True
- self.doneSignal.emit()
-
-
-class InstallThread(QtCore.QThread):
- parent = None
- doneSignal = QtCore.pyqtSignal()
- updateProgressSignal = QtCore.pyqtSignal(dict)
- pkggroups = {}
-
- def __init__(self, parent=None, pkggroups={}):
- super(InstallThread, self).__init__(parent)
- self.parent = parent
- self.pkggroups = pkggroups
- self.doneSignal.connect(parent.installationPage.completeChanged)
- self.updateProgressSignal.connect(
- parent.installationPage.updateProgressSlot)
-
- def run(self):
- install = {}
- install_extras = {}
- parent = self.parent
-
- # Disable back and next buttons
- parent.installationPage.done = False
- self.doneSignal.emit()
- self.updateProgressSignal.emit(
- { 'value': 1, 'label': _("Starting installation..."),
- 'details': _("Starting installation...")})
-
- # Update packages list
- self.updateProgressSignal.emit({ 'value': 5,
- 'label': _("Updating packages list..."),
- 'details': _("Updating packages list...")})
-
- result = subprocess.run(['pkcon', 'refresh'],
- stdout=subprocess.PIPE, stderr=subprocess.PIPE)
- if result.returncode == 0:
- if result.stdout:
- self.updateProgressSignal.emit({
- 'details': result.stdout.decode('UTF-8')})
- else:
- if result.stderr:
- self.updateProgressSignal.emit({
- 'details': result.stderr.decode('UTF-8')})
-
- # Perform system update
- self.updateProgressSignal.emit({ 'value': 10,
- 'label': _("Updating installed packages..."),
- 'details': _("Updating installed packages...")})
-
- result = subprocess.run(['pkcon', 'update', '-y'],
- stdout=subprocess.PIPE, stderr=subprocess.PIPE)
- if result.returncode == 0:
- if result.stdout:
- self.updateProgressSignal.emit({
- 'details': result.stdout.decode('UTF-8')})
- else:
- if result.stderr:
- self.updateProgressSignal.emit({
- 'details': result.stderr.decode('UTF-8')})
-
- self.updateProgressSignal.emit({ 'value': 20 })
-
- arch = os.uname()[4]
- if arch == 'i686':
- arch = 'i586'
- elif arch[:3] == 'arm':
- arch = 'arm'
- client = packagekit.Client()
-
- # Install requested package groups
- for group in parent.selectGroupsPage.groups_checkboxes:
- install[group] = \
- parent.selectGroupsPage.groups_checkboxes[group].isChecked() \
- and parent.selectGroupsPage.groups_checkboxes[group].isEnabled()
-
- for inst in install:
- if install[inst]:
- self.updateProgressSignal.emit({
- 'label': _("Installing %s group packages..." % inst),
- 'details': _("Installing %s group packages..." % inst)})
- for pkg in self.pkggroups[inst].split():
- result =client.resolve(0, (pkg,), None,
- self.packagekit_progress_cb, None)
- pkgs = result.get_package_array()
- for p in pkgs:
- if 'installed' in p.get_data().split(':'):
- self.updateProgressSignal.emit({
- 'details': _("Package %s is already installed" % pkg)})
- break
- if p.get_arch() != arch:
- continue
- packageid = p.get_name() + ';' + p.get_version() + ';' \
- + p.get_arch() + ';' + p.get_data()
- self.updateProgressSignal.emit({
- 'details': _("Installing package %s" % pkg)})
- client.install_packages(False, (packageid, ), None,
- self.packagekit_progress_cb, p.get_name())
-
- # Install requested extra packages
- for extra in parent.selectExtraPage.extra_checkboxes:
- install_extras[extra] = \
- parent.selectExtraPage.extra_checkboxes[extra].isChecked() \
- and parent.selectExtraPage.extra_checkboxes[extra].isEnabled()
-
- for extra in install_extras:
- if install_extras[extra]:
- self.updateProgressSignal.emit({
- 'label': _("Installing %s extra component..." % extra),
- 'details': _("Installing %s extra component..." % extra)})
- if extra == 'nvidia':
- result = subprocess.run([
- '/usr/share/openmamba/mambabase/nvidia-autoselect-driver',
- '-i'],
- stdout=subprocess.PIPE, stderr=subprocess.PIPE)
- else:
- result = subprocess.run(['/usr/bin/openmamba-netsrpms', extra],
- stdout=subprocess.PIPE, stderr=subprocess.PIPE)
- if result.returncode == 0:
- if result.stdout:
- self.updateProgressSignal.emit({
- 'details': result.stdout.decode('UTF-8')})
- else:
- if result.stderr:
- self.updateProgressSignal.emit({
- 'details': result.stderr.decode('UTF-8')})
-
-
- # Finished
- self.updateProgressSignal.emit({ 'value': 100,
- 'label': _("Installation finished!"),
- 'details': _("Installation finished!")})
-
- # Remove any autostart file
- try:
- file_path = Path.home() / ".config/autostart/mambabase.desktop"
- file_path.unlink()
- except:
- None
-
- # Enable back and next buttons
- parent.installationPage.done = True
- self.doneSignal.emit()
-
- def packagekit_progress_cb(self, status, typ, data=None):
- if status.get_property('package'):
- self.updateProgressSignal.emit({
- 'label': _("Installing %s package (%s)..." %
- (status.get_property('package').get_name(),
- str(status.get_percentage())))})
-
-
-class WelcomePage(QtWidgets.QWizardPage):
- done = False
-
- def __init__(self, parent=None):
- super(WelcomePage, self).__init__(parent)
- uic.loadUi(DATADIR + "WelcomePage.ui", self)
- self.show()
-
- def isComplete(self):
- return self.done
-
- @QtCore.pyqtSlot(dict)
- def updateProgressSlot(self, dict):
- if 'value' in dict:
- self.progressBar.setValue(dict['value'])
- if 'label' in dict:
- self.progressLabel.setText(dict['label'])
-
-
-class SelectGroupsPage(QtWidgets.QWizardPage):
- groups_checkboxes = {}
- pkggroups = {}
-
- def __init__(self, parent=None):
- super(SelectGroupsPage, self).__init__(parent)
- uic.loadUi(DATADIR + "SelectGroupsPage.ui", self)
- self.show()
-
- def loadPkgGroups(self):
- self.groups_checkboxes = {
- 'base': self.inst_base,
- 'office': self.inst_office,
- 'multimedia_players': self.inst_players,
- 'multimedia_editing': self.inst_multimedia_editing,
- 'internet': self.inst_internet,
- 'graphics': self.inst_graphics,
- 'games': self.inst_games,
- 'virtualization': self.inst_virtualization,
- 'server': self.inst_server
- }
- #'devel': self.inst_devel
- # Load packages group db into a dict
- result = subprocess.run([DATADIR + "mambabase-pkggroups-parser.sh"],
- stdout=subprocess.PIPE)
- lines = result.stdout.decode('UTF-8').splitlines()
- for line in lines:
- if line:
- (key, val) = line.split("=")
- self.pkggroups[key] = val
-
- # Check for groups already installed
- client = packagekit.Client()
- for group in self.groups_checkboxes:
- group_installed = True
- if group in self.pkggroups:
- for pkg in self.pkggroups[group].split():
- result = client.resolve(0, (pkg,), None,
- self.packagekit_progress_cb, None)
- pkgs_found = result.get_package_array()
- package_installed = False
- for p in pkgs_found:
- if 'installed' in p.get_data().split(':'):
- package_installed = True
- break
- if not package_installed and len(pkgs_found) > 0:
- group_installed = False
- elif len(pkgs_found) == 0:
- print(_("WARNING: package %s from group %s not found in repositories"
- % (pkg, group)))
- if group_installed:
- self.groups_checkboxes[group].setChecked(True)
- self.groups_checkboxes[group].setEnabled(False)
-
- def packagekit_progress_cb(self, status, typ, data=None):
- pass
-
-
-class SelectExtraPage(QtWidgets.QWizardPage):
- extra_checkboxes = {}
-
- def __init__(self, parent=None):
- super(SelectExtraPage, self).__init__(parent)
- uic.loadUi(DATADIR + "SelectExtraPage.ui", self)
- self.setCommitPage(True)
- self.show()
-
- def setExtras(self):
- self.extra_checkboxes = {
- 'nvidia': self.inst_nvidia,
- 'broadcom_sta': self.inst_broadcom_sta,
- 'b43-firmware': self.inst_b43,
- 'msttcorefonts': self.inst_msttcf,
- 'virtualbox-extension-pack': self.inst_virtualbox,
- 'chromium-widevine': self.inst_widevine
- }
- for extra in self.extra_checkboxes:
- result = subprocess.run(['/usr/bin/openmamba-netsrpms', '-c', extra],
- stdout=subprocess.PIPE)
- if result.returncode < 2:
- self.extra_checkboxes[extra].setChecked(True)
- self.extra_checkboxes[extra].setEnabled(False)
-
-
-class InstallationPage(QtWidgets.QWizardPage):
- done = False
-
- def __init__(self, parent=None):
- super(InstallationPage, self).__init__(parent)
- uic.loadUi(DATADIR + "InstallationPage.ui", self)
- self.setCommitPage(True)
- self.show()
-
- def isComplete(self):
- if self.done:
- self.installPageTitle.setText(
- _('
' +
- '' +
- 'All done!
'))
- return self.done
-
- @QtCore.pyqtSlot(dict)
- def updateProgressSlot(self, dict):
- if 'value' in dict:
- self.progressBar.setValue(dict['value'])
- if 'label' in dict:
- self.progressLabel.setText(dict['label'])
- if 'details' in dict:
- self.progressDetails.append("
" + dict['details'])
-
-
-if __name__ == '__main__':
- import sys
- app = QtWidgets.QApplication(sys.argv)
- app.setWindowIcon(QtGui.QIcon(DATADIR + "mambabase.png"))
- # UI translations
- locale = QLocale.system().name()
- language = locale[0:2]
- qtTranslator = QTranslator()
- if qtTranslator.load("mambabase", "/usr/share/locale/" + locale + "/LC_MESSAGES/"):
- app.installTranslator(qtTranslator)
- elif qtTranslator.load("mambabase", "/usr/share/locale/" + language + "/LC_MESSAGES/"):
- app.installTranslator(qtTranslator)
- # PY translations
- gettext.install('mambabase', '/usr/share/locale')
- wizard = MambabaseWizard()
- wizard.show()
- sys.exit(app.exec_())
diff --git a/mambabase/mambabase_it.ts b/mambabase/mambabase_it.ts
deleted file mode 100644
index 6ac6955..0000000
--- a/mambabase/mambabase_it.ts
+++ /dev/null
@@ -1,147 +0,0 @@
-
-
-
-
- Form
-
-
-
-
-
-
-
-
-
-
-
-
- <html><head/><body><p align="center"><span style=" font-size:14pt; font-weight:600;">Installazione completata.</span></p></body></html>
-
-
-
-
- <html><head/><body><p>Se incontri dei problemmi per favore verifica i messaggi di avviso o errore riportati nel registro di installazione sottostante ed invia un report usando l'apposito form sul sito <a href="https://openmamba.org"><span style=" text-decoration: underline; color:#2980b9;">openmamba.org</span></a>.</p></body></html>
-
-
-
-
- <html><head/><body><p align="center"><span style=" font-size:14pt; font-weight:600;">Installazione in corso...</span></p></body></html>
-
-
-
-
- <html><head/><body><p><span style=" font-weight:600;">Dettagli dell'installazione:</span></p></body></html>
-
-
-
-
-
- <html><head/><body><p><span style=" font-weight:600;">Per favore, seleziona usando i checkbox sottostanti i componenti che desideri installare o aggiornare dalla rete.</span></p></body></html>
-
-
-
-
- Installazione/aggiornamento di componenti software proprietari
-
-
-
-
- Driver video proprietario NVIDIA (rilevato automaticamente) da openmamba.org
-
-
-
-
- Driver wireless proprietario Broadcom-sta da openmamba.org
-
-
-
-
- Firmware proprietario per Broadcom B43 da openwrt.org
-
-
-
-
- MS TrueType core fonts da sourceforge
-
-
-
-
- VirtualBox extension pack da virtualbox.org
-
-
-
-
- Estensione Widevine da google.com
-
-
-
-
- Installazioni/aggiornamenti di openmamba
-
-
-
-
- Pacchetti base di sistema (raccomandato)
-
-
-
-
- Pacchetti per l'ufficio (OpenOffice, ...)
-
-
-
-
- Player audio e video (VLC, kaffeine, ...)
-
-
-
-
- Editing e produzione multimediale (kino, audacity, rosegarden, mixxx, ...)
-
-
-
-
- Internet, comunicazioni e p2p
-
-
-
-
- Software per la grafica (gimp, digikam, blender, krita)
-
-
-
-
- Emulazione e virtualizzazione (VirtualBox, wine)
-
-
-
-
- Base di pacchetti per server web (Apache, PHP, MariaDB, ...)
-
-
-
-
- Giochi (tuxracer, pingus, ksudoku, ...)
-
-
-
-
- <html><head/><body><p><span style=" font-style:italic;">mambabase - Copyright (c) 2007-2021 by Silvan Calarco<br/>Rilasciato secondo i termini della licenza GNU GPL v3</span></p></body></html>
-
-
-
-
-
-
-
-
-
- <html><head/><body><p>Questa applicazione completerà l'installazione aggiungendo al sistema un set minimo di pacchetti raccomandati. In aggiunta permette di installare, se selezionati, gruppi di pacchetti e componenti proprietari aggiuntivi.</p><p><span style=" font-weight:600;">TIP</span>: puoi eseguire questa applicazione in qualunque momento dal <span style=" font-style:italic;">centro di controllo di openmamba</span> sulla barra delle icone.</p></body></html>
-
-
-
-
-
-
-
-
diff --git a/mambabase/nvidia-autoselect-driver b/mambabase/nvidia-autoselect-driver
deleted file mode 100755
index 2ddffd7..0000000
--- a/mambabase/nvidia-autoselect-driver
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/bin/bash
-#
-# nVidia legacy test script
-#
-# Copyright (c) 2007-2015 by Silvan Calarco
-# Released under the GNU GPL v.3 license
-#
-
-[ "$1" = "-i" ] && DO_INSTALL=1
-
-PCIID=`/usr/sbin/lspci -n | grep " 0300: 10de:" | awk '{ print $3 }'`
-
-[ "$PCIID" ] || {
- echo "No NVIDIA PCI device found!" >&2
- exit 1
-}
-
-DEVID=`echo ${PCIID/*:/} | tr '[:lower:]' '[:upper:]'`
-
-case $DEVID in
- 0191|0193|0194|0197|019D|019E|0400|0401|0402|0403|\
- 0404|0405|0406|0407|0408|0409|040A|040B|040C|040D|\
- 040E|040F|0410|0420|0421|0422|0423|0424|0425|0426|\
- 0427|0428|0429|042A|042B|042C|042D|042E|042F|05E0|\
- 05E1|05E2|05E3|05E6|05E7|05EA|05EB|05ED|05F8|05F9|\
- 05FD|05FE|05FF|0600|0601|0602|0603|0604|0605|0606|\
- 0607|0608|0609|060A|060B|060C|060D|060F|0610|0611|\
- 0612|0613|0614|0615|0617|0618|0619|061A|061B|061C|\
- 061D|061E|061F|0621|0622|0623|0625|0626|0627|0628|\
- 062A|062B|062C|062D|062E|0630|0631|0632|0635|0637|\
- 0638|063A|0640|0641|0643|0644|0645|0646|0647|0648|\
- 0649|064A|064B|064C|0651|0652|0653|0654|0655|0656|\
- 0658|0659|065A|065B|065C|06E0|06E1|06E2|06E3|06E4|\
- 06E5|06E6|06E7|06E8|06E9|06EA|06EB|06EC|06EF|06F1|\
- 06F8|06F9|06FA|06FB|06FD|06FF|0840|0844|0845|0846|\
- 0847|0848|0849|084A|084B|084C|084D|084F|0860|0861|\
- 0862|0863|0864|0865|0866|0867|0868|0869|086A|086C|\
- 086D|086E|086F|0870|0871|0872|0873|0874|0876|087A|\
- 087D|087E|087F|08A0|08A2|08A3|08A4|08A5|0A20|0A22|\
- 0A23|0A26|0A27|0A28|0A29|0A2A|0A2B|0A2C|0A2D|0A32|\
- 0A34|0A35|0A38|0A3C|0A60|0A62|0A63|0A64|0A65|0A66|\
- 0A67|0A68|0A69|0A6A|0A6C|0A6E|0A6F|0A70|0A71|0A72|\
- 0A73|0A74|0A75|0A76|0A78|0A7A|0A7C|0CA0|0CA2|0CA3|\
- 0CA4|0CA5|0CA7|0CA8|0CA9|0CAC|0CAF|0CB0|0CB1|0CBC|\
- 10C0|10C3|10C5|10D8) ALT_SUFFIX='340' ;;
-
- 0040|0041|0042|0043|0044|0045|0046|0047|0048|004E|\
- 0090|0091|0092|0093|0095|0098|0099|009D|00C0|00C1|\
- 00C2|00C3|00C8|00C9|00CC|00CD|00CE|00F1|00F2|00F3|\
- 00F4|00F5|00F6|00F8|00F9|0140|0141|0142|0143|0144|\
- 0145|0146|0147|0148|0149|014A|014C|014D|014E|014F|\
- 0160|0161|0162|0163|0164|0165|0166|0167|0168|0169|\
- 016A|01D0|01D1|01D2|01D3|01D6|01D7|01D8|01DA|01DB|\
- 01DC|01DD|01DE|01DF|0211|0212|0215|0218|0221|0222|\
- 0240|0241|0242|0244|0245|0247|0290|0291|0292|0293|\
- 0294|0295|0297|0298|0299|029A|029B|029C|029D|029E|\
- 029F|02E0|02E1|02E2|02E3|02E4|038B|0390|0391|0392|\
- 0393|0394|0395|0397|0398|0399|039C|039E|03D0|03D1|\
- 03D2|03D5|03D6|0531|0533|053A|053B|053E|07E0|07E1|\
- 07E2|07E3|07E5) ALT_SUFFIX='304' ;;
-
- 00FA|00FB|00FC|00FD|00FE|0301|0302|0308|0309|0311|\
- 0312|0314|031A|031B|031C|0320|0321|0322|0323|0324|\
- 0325|0326|0327|0328|032A|032B|032C|032D|0330|0331|\
- 0332|0333|0334|0338|033F|0341|0342|0343|0344|0347|\
- 0348|034C|034E) ALT_SUFFIX='173' ;;
-
- 0110|0111|0112|0113|0170|0171|0172|0173|0174|0175|\
- 0176|0177|0178|0179|017A|017C|017D|0181|0182|0183|\
- 0185|0188|018A|018B|018C|01A0|01F0|0200|0201|0202|\
- 0203|0250|0251|0253|0258|0259|025B|0280|0281|0282|\
- 0286|0288|0289|028C) ALT_SUFFIX='96' ;;
-
- 0020|0028|0029|002C|002D|00A0|0100|0101|0103|0150|\
- 0151|0152|0153) ALT_SUFFIX='71' ;;
-
- *) ALT_SUFFIX='' ;;
-esac
-
-case $ALT_SUFFIX in
- 340) REC_DRIVER='xorg-drv-video-nvidia_340' ;;
- 304) REC_DRIVER='xorg-drv-video-nvidia_304' ;;
- 173|96|71) REC_DRIVER='nouveau' ;;
- *) REC_DRIVER='xorg-drv-video-nvidia' ;;
-esac
-
-echo "NVIDIA recommended driver is $REC_DRIVER" >&2
-
-if [ "$DO_INSTALL" = "1" ]; then
- rpm -q $REC_DRIVER || pkcon install -y $REC_DRIVER
-fi
diff --git a/mambabase/openmamba.png b/mambabase/openmamba.png
deleted file mode 100644
index ff941ba..0000000
Binary files a/mambabase/openmamba.png and /dev/null differ
diff --git a/mambabase/po/it.po b/mambabase/po/it.po
deleted file mode 100644
index 2290e50..0000000
--- a/mambabase/po/it.po
+++ /dev/null
@@ -1,87 +0,0 @@
-# mambabase translations
-# Copyright (C) 2021 Silvan Calarco
-# This file is distributed under the same license as the mambabase package.
-# Silvan Calarco , 2021.
-#
-#: _from_rc.cc:3 _from_rc.cc:4 _from_rc.cc:5 _from_rc.cc:12 _from_rc.cc:42
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-19 11:05+0100\n"
-"Last-Translator: Silvan Calarco \n"
-"Language-Team: LANGUAGE \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: mambabase.py:338
-msgid ""
-"All done!
"
-msgstr ""
-"Tutto fatto!
"
-
-#: mambabase.py:65
-msgid "Checking installed extra components..."
-msgstr "Controllo dei componenti aggiuntivi installati..."
-
-#: mambabase.py:62
-msgid "Checking installed packages..."
-msgstr "Controllo dei pacchetti installati..."
-
-#: mambabase.py:68
-msgid "Done. Please, press the Next button to continue."
-msgstr "Fatto. Premi il pulsante Successivo per continuare."
-
-#: mambabase.py:201 mambabase.py:202
-msgid "Installation finished!"
-msgstr "Installazione terminata!"
-
-#: mambabase.py:179 mambabase.py:180
-#, python-format
-msgid "Installing %s extra component..."
-msgstr "Installazione del componente aggiuntivo %s..."
-
-#: mambabase.py:150 mambabase.py:151
-#, python-format
-msgid "Installing %s group packages..."
-msgstr "Installazione del gruppo di pacchetti %s..."
-
-#: mambabase.py:218
-#, python-format
-msgid "Installing %s package (%s)..."
-msgstr "Installazione del pacchetto %s (%s)..."
-
-#: mambabase.py:166
-#, python-format
-msgid "Installing package %s"
-msgstr "Installazione del pacchetto %s"
-
-#: mambabase.py:159
-#, python-format
-msgid "Package %s is already installed"
-msgstr "Il pacchetto %s è già installato"
-
-#: mambabase.py:97 mambabase.py:98
-msgid "Starting installation..."
-msgstr "Avvio dell'installazione..."
-
-#: mambabase.py:118 mambabase.py:119
-msgid "Updating installed packages..."
-msgstr "Aggiornamento dei pacchetti installati in corso..."
-
-#: mambabase.py:102 mambabase.py:103
-msgid "Updating packages list..."
-msgstr "Aggiornamento della lista dei pacchetti..."
-
-#: mambabase.py:290
-#, python-format
-msgid "WARNING: package %s from group %s not found in repositories"
-msgstr "AVVISO: il pacchetto %s del gruppo %s non è stato trovato nei repository"
-
-#: mambabase.py:33
-msgid "openmamba base network installations"
-msgstr "Installazione di componenti dalla rete"
diff --git a/mambabase/po/messages.pot b/mambabase/po/messages.pot
deleted file mode 100644
index e123c42..0000000
--- a/mambabase/po/messages.pot
+++ /dev/null
@@ -1,85 +0,0 @@
-# mambabase translations
-# Copyright (C) 2021 Silvan Calarco
-# This file is distributed under the same license as the mambabase package.
-# Silvan Calarco , 2021.
-#
-#: _from_rc.cc:3 _from_rc.cc:4 _from_rc.cc:5 _from_rc.cc:12 _from_rc.cc:42
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-19 11:05+0100\n"
-"Last-Translator: Silvan Calarco \n"
-"Language-Team: LANGUAGE \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: mambabase.py:338
-msgid ""
-"All done!
"
-msgstr ""
-
-#: mambabase.py:65
-msgid "Checking installed extra components..."
-msgstr ""
-
-#: mambabase.py:62
-msgid "Checking installed packages..."
-msgstr ""
-
-#: mambabase.py:68
-msgid "Done. Please, press the Next button to continue."
-msgstr ""
-
-#: mambabase.py:201 mambabase.py:202
-msgid "Installation finished!"
-msgstr ""
-
-#: mambabase.py:179 mambabase.py:180
-#, python-format
-msgid "Installing %s extra component..."
-msgstr ""
-
-#: mambabase.py:150 mambabase.py:151
-#, python-format
-msgid "Installing %s group packages..."
-msgstr ""
-
-#: mambabase.py:218
-#, python-format
-msgid "Installing %s package (%s)..."
-msgstr ""
-
-#: mambabase.py:166
-#, python-format
-msgid "Installing package %s"
-msgstr ""
-
-#: mambabase.py:159
-#, python-format
-msgid "Package %s is already installed"
-msgstr ""
-
-#: mambabase.py:97 mambabase.py:98
-msgid "Starting installation..."
-msgstr ""
-
-#: mambabase.py:118 mambabase.py:119
-msgid "Updating installed packages..."
-msgstr ""
-
-#: mambabase.py:102 mambabase.py:103
-msgid "Updating packages list..."
-msgstr ""
-
-#: mambabase.py:290
-#, python-format
-msgid "WARNING: package %s from group %s not found in repositories"
-msgstr ""
-
-#: mambabase.py:33
-msgid "openmamba base network installations"
-msgstr ""
diff --git a/mambabase/update-translations.sh b/mambabase/update-translations.sh
deleted file mode 100755
index a5a1e96..0000000
--- a/mambabase/update-translations.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-xgettext -s -o - mambabase.py --output=po/messages.pot
-msgmerge --update --no-fuzzy-matching --backup=off po/it.po po/messages.pot
-lupdate *.ui -ts mambabase_it.ts
\ No newline at end of file