some cleanup
This commit is contained in:
parent
b53b4d3aa5
commit
feb669a476
|
|
@ -12,6 +12,7 @@ if [ "$(mount | grep $CHROOT" " | cut -c -16)" = "/dev/mapper/luks" ]; then
|
|||
chroot $CHROOT apt-get -y install cryptsetup-initramfs cryptsetup keyutils
|
||||
fi
|
||||
|
||||
# Update packages in the repos
|
||||
chroot $CHROOT apt-get update
|
||||
|
||||
echo "Running bootloader-config..."
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
../deb/applications
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
[Desktop Entry]
|
||||
Version=1.0
|
||||
Type=Application
|
||||
Name=Install Peppermint
|
||||
Name[bg]=Инсталиране на Peppermint
|
||||
Name[es]=Instale Peppermint
|
||||
Name[fr]= Installer Peppermint
|
||||
Name[hu]=Telepítse a Peppermint
|
||||
Name[it]=Installare Peppermint
|
||||
Name[ja]=インストール Peppermint
|
||||
Name[pt]=Instalar Peppermint
|
||||
Name[pt_BR]=Instalar Peppermint
|
||||
Name[ru]=Установить Peppermint
|
||||
Exec=install-peppermint
|
||||
Icon=install-debian.png
|
||||
Terminal=false
|
||||
Categories=Settings
|
||||
Comment=Calamares — Installer for Peppermint Live
|
||||
Keywords=calamares;system;install;peppermint;installer
|
||||
StartupNotify=True
|
||||
StartupWMClass=calamares
|
||||
|
|
@ -0,0 +1 @@
|
|||
../deb/branding
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
---
|
||||
componentName: peppermint
|
||||
welcomeStyleCalamares: false
|
||||
welcomeExpandingLogo: true
|
||||
windowExpanding: normal
|
||||
windowSize: 700,450
|
||||
windowPlacement: center
|
||||
|
||||
strings:
|
||||
productName: Peppermint
|
||||
shortProductName: Peppermint
|
||||
version: 00
|
||||
shortVersion: 00
|
||||
versionedName: Peppermint
|
||||
shortVersionedName: Peppermint
|
||||
bootloaderEntryName: Peppermint
|
||||
productUrl: https://peppermintos.com
|
||||
supportUrl: https://sourceforge.net/p/peppermintos/pepos/
|
||||
releaseNotesUrl: https://peppermintos.com
|
||||
|
||||
images:
|
||||
productLogo: "pep-logo.png"
|
||||
productIcon: "pep-logo.png"
|
||||
productWelcome: "welcome.png"
|
||||
|
||||
slideshow: "show.qml"
|
||||
|
||||
style:
|
||||
sidebarBackground: "#C0C0C0"
|
||||
sidebarText: "#000000"
|
||||
sidebarTextSelect: "#ffffff"
|
||||
sidebarTextHighlight: "#f62817"
|
||||
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 15 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 54 KiB |
|
|
@ -1,40 +0,0 @@
|
|||
/* === This file is part of Calamares - <http://github.com/calamares> ===
|
||||
*
|
||||
* Copyright 2015, Teo Mrnjavac <teo@kde.org>
|
||||
* Copyright 2018-2019, Jonathan Carter <jcc@debian.org>
|
||||
*
|
||||
* Calamares is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, or (at your option) any later version.
|
||||
*
|
||||
* Calamares is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
import QtQuick 2.0;
|
||||
import calamares.slideshow 1.0;
|
||||
|
||||
Presentation
|
||||
{
|
||||
id: presentation
|
||||
Timer {
|
||||
interval: 20000
|
||||
running: true
|
||||
repeat: true
|
||||
onTriggered: presentation.goToNextSlide()
|
||||
}
|
||||
Slide {
|
||||
Image {
|
||||
id: background5
|
||||
source: "s5.png"
|
||||
width: 2000; height: 2000
|
||||
fillMode: Image.PreserveAspectFit
|
||||
anchors.centerIn: parent
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,163 +0,0 @@
|
|||
/*########Current Calamares Styles##########*/
|
||||
/* These "Q's" are master styles for overall colours */
|
||||
#mainApp {background-color: #C0C0C0;
|
||||
font-family: Cantarell;
|
||||
font-weight: bold;
|
||||
color: #000000
|
||||
}
|
||||
|
||||
/* Set the entire Font and Background color */
|
||||
QWidget { color: #000000 ;
|
||||
background-color: #C0C0C0;
|
||||
font-family: Cantarell;
|
||||
font: 14px; }
|
||||
|
||||
#globalStorageTab { background-color: #C0C0C0 }
|
||||
|
||||
/* Set Drop Down Font and Background color */
|
||||
QComboBox { font: 14px ;
|
||||
color: #000000 ;
|
||||
background-color: #ffffff ;
|
||||
padding: 2px ;
|
||||
border-radius: 10px
|
||||
}
|
||||
|
||||
#languageWidget { font: 14px ;
|
||||
color: #111111 ;
|
||||
background-color: #ffffff ;
|
||||
text-align: center ;
|
||||
border-radius: 6px
|
||||
}
|
||||
|
||||
/* Set the inline Text box edit Font and Background color */
|
||||
QLineEdit { font: 14px;
|
||||
color: #111111;
|
||||
background-color: #ffffff;
|
||||
border-color: #000000
|
||||
}
|
||||
|
||||
/* Set List box Font and Background color */
|
||||
QListView { font: 14px;
|
||||
color: #000000;
|
||||
background-color: #ffffff;
|
||||
alternate-background-color: #C0C0C0;
|
||||
padding: 2px;
|
||||
border-radius: 4px
|
||||
}
|
||||
|
||||
#layoutSelector {}
|
||||
|
||||
/* Set the TreeView Font and Background color */
|
||||
QTreeView { color: #000000;
|
||||
background-color: #ffffff;
|
||||
border-radius: 14px
|
||||
}
|
||||
|
||||
/* Set buttons Font and Background color */
|
||||
QPushButton { font: 14px;
|
||||
color: #000000;
|
||||
background-color: #C0C0C0;
|
||||
border-color: #000000;
|
||||
border-width: 10px;}
|
||||
|
||||
#view-button-back { font: 14px;
|
||||
background-color: #C0C0C0
|
||||
}
|
||||
#view-button-back:hover { font: 14px;
|
||||
color: #000000;
|
||||
background-color: #ffffff;
|
||||
border-color: #000000
|
||||
}
|
||||
#view-button-next { font: 14px;
|
||||
background-color: #C0C0C0;
|
||||
border-color: #000000
|
||||
}
|
||||
#view-button-next:hover { font: 14px;
|
||||
color: #000000;
|
||||
background-color: #ffffff;
|
||||
border-color: #000000
|
||||
}
|
||||
#view-button-cancel { font: 14px;
|
||||
background-color: #C0C0C0;
|
||||
border-color: #000000
|
||||
}
|
||||
#view-button-cancel:hover { font: 14px;
|
||||
color: #000000;
|
||||
background-color: #ffffff;
|
||||
border-color: #000000;
|
||||
}
|
||||
#view-button-install { font: 14px;
|
||||
color: #C0C0C0;
|
||||
border-color: #000000
|
||||
}
|
||||
#view-button-done { font: 14px;
|
||||
color: #000000;
|
||||
border-color: #000000
|
||||
}
|
||||
|
||||
/* Set the color in the keyboard selection */
|
||||
#layoutSelector { selection-background-color: #F62817 }
|
||||
#variantSelector { selection-background-color: #F62817 }
|
||||
|
||||
/* Set the CheckBox size and Background color */
|
||||
QCheckBox { color: #000000;
|
||||
background-color: #C0C0C0;
|
||||
border-width: 2px;
|
||||
border-color: #000000
|
||||
}
|
||||
|
||||
m_encryptCheckBox { font: 14px;
|
||||
color: #F62817;
|
||||
background-color: #C0C0C0;
|
||||
border-radius: 4px;
|
||||
padding: 6px
|
||||
}
|
||||
|
||||
checkBoxDoAutoLogin { font: 14px;
|
||||
color: #000000;
|
||||
background-color: #C0C0C0;
|
||||
padding: 4px
|
||||
}
|
||||
|
||||
restartCheckBox { font: 14px;
|
||||
color: #000000;
|
||||
background-color: #C0C0C0;
|
||||
border-color: #000000;
|
||||
border-radius: 8px;
|
||||
height: 16px;
|
||||
width: 100px;
|
||||
padding: 4px
|
||||
}
|
||||
|
||||
#QCheckBox#restartCheckBox::indicator:checked { image: url(/usr/share/pixmaps/ckm.png) }
|
||||
|
||||
/* Set the color when selected */
|
||||
QRadioButton { color: #000000;
|
||||
background-color: #C0C0C0;
|
||||
padding: 4px;
|
||||
border-radius: 4px
|
||||
}
|
||||
QComboBoxPrivateContainer { background-color: #ffffff }
|
||||
QComboBoxListView { background-color: #ffffff }
|
||||
qt_scrollarea_hcontainer { background-color: #ffffff }
|
||||
qt_scrollarea_vcontainer { background-color: #ffffff }
|
||||
QRadioButton::indicator { width: 18px ; height: 18px }
|
||||
QRadioButton::indicator::checked { image: url(/usr/share/pixmaps/peppermint.png) }
|
||||
QRadioButton::indicator::checked:hover { image: url(/usr/share/pixmaps/peppermint-fm-20.png) }
|
||||
QRadioButton::indicator::unchecked:hover { image: url(/usr/share/pixmaps/peppermint-inst.png) }
|
||||
|
||||
/* Set the tip Font and Background color */
|
||||
QToolTip { font: 14px;
|
||||
color: #000000;
|
||||
background-color: #ffffff;
|
||||
padding: 4px;
|
||||
border-radius: 4px
|
||||
}
|
||||
|
||||
/* Set the Progress Bar alignment and load color */
|
||||
QProgressBar { text-align: center }
|
||||
QProgressBar::chunk { background-color: #F62817 }
|
||||
|
||||
#debugButton {font: }
|
||||
#sidebarMenuApp{ background-color: #C0C0C0 }
|
||||
#tabWidget { background-color: #C0C0C0 }
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 11 KiB |
|
|
@ -0,0 +1 @@
|
|||
../deb/modules
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
---
|
||||
type: "job"
|
||||
name: "grub-defaults"
|
||||
interface: "process"
|
||||
command: "/usr/sbin/grub-defaults"
|
||||
timeout: 600
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
---
|
||||
type: "job"
|
||||
name: "update-system"
|
||||
interface: "process"
|
||||
command: "/usr/sbin/update-system"
|
||||
timeout: 600
|
||||
|
|
@ -0,0 +1 @@
|
|||
../deb/schemas
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
# Launcher icons
|
||||
[org.gnome.shell]
|
||||
favorite-apps=['install-peppermint.desktop', 'Welcome.desktop', firefox-esr.desktop', 'libreoffice-writer.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop', 'yelp.desktop']
|
||||
|
||||
# We don't want the screensaver to enable on the live media while installing
|
||||
[org.gnome.desktop.lockdown]
|
||||
disable-lock-screen=true
|
||||
|
||||
[org.gnome.desktop.session]
|
||||
idle-delay=0
|
||||
|
|
@ -0,0 +1 @@
|
|||
../deb/scripts
|
||||
|
|
@ -1,35 +0,0 @@
|
|||
#!/bin/sh
|
||||
# Creates an "Install Debian" icon on the live session tested with:
|
||||
# Xfce, LXDE, LXqt, Gnome, KDE, Mate, Cinnamon
|
||||
|
||||
# We query xdg-user-dir because the Desktop directory has different
|
||||
# names for different languages
|
||||
DESKTOP=$(xdg-user-dir DESKTOP)
|
||||
|
||||
# Create ~/Desktop just in case this runs before the xdg folder
|
||||
# creation script.
|
||||
mkdir -p $DESKTOP
|
||||
|
||||
# Among the Debian desktop environments, LXDE is the only one
|
||||
# that behaves completely different.
|
||||
if [ -f /usr/bin/lxsession ]; then
|
||||
echo "[Desktop Entry]" > $DESKTOP/calamares-install-peppermint.desktop
|
||||
echo "Type=Link" >> $DESKTOP/calamares-install-peppermint.desktop
|
||||
echo "Name=Install Debian" >> $DESKTOP/calamares-install-peppermint.desktop
|
||||
echo "Icon=install-debian" >> $DESKTOP/calamares-install-peppermint.desktop
|
||||
echo "URL=/usr/share/applications/calamares-install-peppermint.desktop" \
|
||||
>> $DESKTOP/calamares-install-peppermint.desktop
|
||||
else
|
||||
cp /usr/share/applications/calamares-install-peppermint.desktop $DESKTOP
|
||||
# Xfce needs this executable otherwise it complains, everything
|
||||
# else doesn't seem to care either way.
|
||||
chmod +x $DESKTOP/calamares-install-peppermint.desktop
|
||||
fi
|
||||
|
||||
# Set desktop launcher as trusted under gnome/xfce (See: #1037299)
|
||||
gio set --type=string ~/Desktop/calamares-install-peppermint.desktop \
|
||||
metadata::trusted true
|
||||
gio set --type=string ~/Desktop/calamares-install-peppermint.desktop \
|
||||
metadata::xfce-exe-checksum \
|
||||
"$(sha256sum ~/Desktop/calamares-install-peppermint.desktop | cut -f1 -d' ')"
|
||||
touch ~/Desktop/calamares-install-peppermint.desktop
|
||||
|
|
@ -1,48 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g")
|
||||
|
||||
# Install luks utilities if needed.
|
||||
# Also, set secure permissions for the initramfs if we're configuring
|
||||
# full-disk-encryption. The initramfs is re-generated later in the
|
||||
# installation process so we only set the permissions snippet without
|
||||
# regenerating the initramfs right now:
|
||||
if [ "$(mount | grep $CHROOT" " | cut -c -16)" = "/dev/mapper/luks" ]; then
|
||||
echo "UMASK=0077" > $CHROOT/etc/initramfs-tools/conf.d/initramfs-permissions
|
||||
chroot $CHROOT apt-get -y install cryptsetup-initramfs cryptsetup keyutils
|
||||
fi
|
||||
|
||||
chroot $CHROOT apt-get update
|
||||
|
||||
echo "Running bootloader-config..."
|
||||
|
||||
# Detect architecture and install the appropriate GRUB package
|
||||
ARCH=$(uname -m)
|
||||
case "$ARCH" in
|
||||
x86_64)
|
||||
if [ -d /sys/firmware/efi/efivars ]; then
|
||||
echo " * Installing grub-efi (uefi)..."
|
||||
DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-efi-amd64
|
||||
else
|
||||
echo " * Installing grub-pc (bios)..."
|
||||
DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-pc
|
||||
fi
|
||||
;;
|
||||
i686)
|
||||
echo " * Installing grub-efi-ia32 (uefi 32-bit)..."
|
||||
DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-efi-ia32
|
||||
;;
|
||||
aarch64)
|
||||
echo " * Installing grub-efi-arm64 (uefi arm64)..."
|
||||
DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-efi-arm64
|
||||
;;
|
||||
*)
|
||||
echo "Unsupported architecture: $ARCH"
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
# Re-enable os-prober:
|
||||
sed -i "s/#GRUB_DISABLE_OS_PROBER=false/# OS_PROBER re-enabled by Debian Calamares installation:\nGRUB_DISABLE_OS_PROBER=false/g" $CHROOT/etc/default/grub
|
||||
chroot $CHROOT /usr/sbin/update-grub
|
||||
|
||||
|
|
@ -1,53 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
#
|
||||
# SPDX-FileCopyrightText: 2023 PeppermintOS Team (peppermintosteam@proton.me)
|
||||
|
||||
# This script configures grub defaults after Debian installation.
|
||||
|
||||
# Define CHROOT
|
||||
CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g")
|
||||
|
||||
# Sets GRUB configuration.
|
||||
# Writes the configuration to the /etc/default/grub file.
|
||||
# Updates the bootloader.
|
||||
|
||||
# Check if CHROOT is set
|
||||
if [ -z "$CHROOT" ]; then
|
||||
echo "CHROOT not set. Exiting."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Defines the variables
|
||||
GRUB_DEFAULT=0
|
||||
GRUB_TIMEOUT=5
|
||||
GRUB_DISTRIBUTOR="Peppermint"
|
||||
GRUB_CMDLINE_LINUX_DEFAULT="quiet splash"
|
||||
GRUB_CMDLINE_LINUX=""
|
||||
GRUB_GFXMODE=1360x768
|
||||
GRUB_THEME="/boot/grub/themes/peppermint/theme.txt"
|
||||
GRUB_DISABLE_OS_PROBER=false
|
||||
|
||||
# GRUB configuration file path
|
||||
GRUB_CONFIG_FILE="$CHROOT/etc/default/grub"
|
||||
|
||||
# Modify the GRUB file
|
||||
sed -i "s/^GRUB_DEFAULT=.*/GRUB_DEFAULT=$GRUB_DEFAULT/" $GRUB_CONFIG_FILE
|
||||
sed -i "s/^GRUB_TIMEOUT=.*/GRUB_TIMEOUT=$GRUB_TIMEOUT/" $GRUB_CONFIG_FILE
|
||||
sed -i "s/^GRUB_DISTRIBUTOR=.*/GRUB_DISTRIBUTOR=\"$GRUB_DISTRIBUTOR\"/" $GRUB_CONFIG_FILE
|
||||
sed -i "s/^GRUB_CMDLINE_LINUX_DEFAULT=.*/GRUB_CMDLINE_LINUX_DEFAULT=\"$GRUB_CMDLINE_LINUX_DEFAULT\"/" $GRUB_CONFIG_FILE
|
||||
sed -i "s/^GRUB_CMDLINE_LINUX=.*/GRUB_CMDLINE_LINUX=\"$GRUB_CMDLINE_LINUX\"/" $GRUB_CONFIG_FILE
|
||||
sed -i "s/^#GRUB_GFXMODE=.*/GRUB_GFXMODE=$GRUB_GFXMODE/" $GRUB_CONFIG_FILE
|
||||
# Add GRUB_THEME if it doesn't exist
|
||||
if ! grep -q "^GRUB_THEME=" $GRUB_CONFIG_FILE; then
|
||||
echo "GRUB_THEME=\"$GRUB_THEME\"" >> $GRUB_CONFIG_FILE
|
||||
else
|
||||
sed -i "s#^GRUB_THEME=.*#GRUB_THEME=\"$GRUB_THEME\"#" $GRUB_CONFIG_FILE
|
||||
fi
|
||||
sed -i "s/^#GRUB_DISABLE_OS_PROBER=.*/GRUB_DISABLE_OS_PROBER=$GRUB_DISABLE_OS_PROBER/" $GRUB_CONFIG_FILE
|
||||
|
||||
# Run update-grub after modifying the file
|
||||
chroot $CHROOT update-grub
|
||||
|
||||
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
#!/bin/sh
|
||||
###
|
||||
# Wrapper for running calamares on Debian live media
|
||||
###
|
||||
|
||||
# Stale file left behind by live-build that messes with partitioning
|
||||
sudo mv /etc/fstab /etc/fstab.orig.calamares
|
||||
|
||||
# Allow Calamares to scale the window for hidpi displays
|
||||
# This is fixed in the Calamares 3.3.0 series, so we can remove this
|
||||
# once we switch to that
|
||||
# Upstream commit that will make this obsolete:
|
||||
# https://github.com/calamares/calamares/commit/e9f011b686a0982fb7828e8ac02a8e0784d3b11f
|
||||
# Upstream bug:
|
||||
# https://github.com/calamares/calamares/issues/1945
|
||||
# Debian bug:
|
||||
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=992162
|
||||
export QT_AUTO_SCREEN_SCALE_FACTOR=1
|
||||
|
||||
# Access control to run calamares as root for xwayland
|
||||
xhost +si:localuser:root
|
||||
pkexec calamares -d
|
||||
xhost -si:localuser:root
|
||||
|
||||
# Restore stale fstab, for what it's worth
|
||||
sudo mv /etc/fstab.orig.calamares /etc/fstab
|
||||
|
|
@ -1,35 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
# Apply updates to the system
|
||||
|
||||
# Function to update the system
|
||||
function update_system() {
|
||||
# Define CHROOT
|
||||
CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g")
|
||||
|
||||
# Verifying CHROOT
|
||||
if [ -z "$CHROOT" ]; then
|
||||
echo "Error: CHROOT is not set."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "Updating the system..."
|
||||
|
||||
# Update the package list
|
||||
chroot $CHROOT /usr/bin/apt update
|
||||
|
||||
# Update installed packages
|
||||
chroot $CHROOT /usr/bin/apt upgrade -y
|
||||
|
||||
# Remove unnecessary packages
|
||||
chroot $CHROOT /usr/bin/apt autoremove -y
|
||||
|
||||
# Clean the APT cache
|
||||
chroot $CHROOT /usr/bin/apt clean
|
||||
|
||||
echo "System successfully updated!"
|
||||
}
|
||||
|
||||
# Run the function to update the system
|
||||
update_system
|
||||
|
||||
|
|
@ -1 +1 @@
|
|||
../dev/applications
|
||||
../deb/applications
|
||||
|
|
@ -1 +1 @@
|
|||
../dev/branding
|
||||
../deb/branding
|
||||
|
|
@ -1 +1 @@
|
|||
../dev/modules
|
||||
../deb/modules
|
||||
|
|
@ -1 +1 @@
|
|||
../dev/schemas
|
||||
../deb/schemas
|
||||
|
|
@ -1 +1 @@
|
|||
../dev/scripts
|
||||
../deb/scripts
|
||||
Loading…
Reference in New Issue