Commit 8c5227ac authored by Chaoting Liu's avatar Chaoting Liu

Merge branch 'master' into 'master'

Master

See merge request chakra/tools/chakra-iso!14
parents e24de6fb d14d134a
Pipeline #1687 passed with stages
in 8 minutes and 40 seconds
......@@ -139,7 +139,7 @@ ttf-lklug
ttf-raleway
ttf-opensans
ttf-noto
ttf-noto-cjk
otf-noto-cjk
ttf-noto-emoji
ttf-hack
......@@ -280,7 +280,6 @@ bomi
clementine-qt5
imagewriter
octopi
octopi-notifier
ark
......@@ -345,14 +344,10 @@ fcitx-googlepinyin
fcitx-kkc
fcitx-hangul
# old QsystemTryIcon (like Skype) integration
sni-qt
# chakra plasmoids
plasma5-applets-welcome-plasmoid
# chakra networkmanagement
#kdeplasma-applets-networkmanagement
plasma-nm
modemmanager
mobile-broadband-provider-info
......@@ -360,10 +355,6 @@ networkmanager-dispatcher-ntpd
nomad-firewall
#spun-live
#clamav
#kdeplasma-addons-applets-lancelot
#kdeplasma-addons-applets-takeoff
#kdeplasma-applets-homerun
#kdeplasma-applets-appmenu-qml
#chakra-paste
# login
......
#!/bin/sh
#
# ~/.xsession
#
# Executed by xdm/gdm/kdm at login
#
/bin/bash --login -i ~/.xinitrc
......@@ -31,14 +31,10 @@ def add_postinall_packages(pacman_config, package_list=None, rootfolder="chakra"
package_dir = os.path.join(rootfolder, "var/cache/pacman/pkg/")
package_dir = os.path.abspath(package_dir)
os.makedirs(package_dir, exist_ok=True)
db_dir = os.path.join(rootfolder, "var/lib/pacman/")
db_dir = os.path.abspath(db_dir)
os.makedirs(db_dir, exist_ok=True)
command = "pacman -Swdd --noconfirm --dbpath {} --cachedir {} --config {} {}"
command = "pacman -Swdd --noconfirm --cachedir {} --config {} {}"
subprocess.check_call(
command.format(
db_dir,
package_dir,
pacman_config,
" ".join(package_list)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment