diff --git a/PKGBUILD b/PKGBUILD index 311e03c..7836f15 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,19 +1,18 @@ # Maintainer: zj <1052308357@qq.com> -pkgname=bbt-calamares-config +pkgname=tms-calamares-config _destname1="/etc" pkgver=25.12 -pkgrel=16 +pkgrel=30 pkgdesc="calamares for bbt" arch=('any') url="https://yuyujing.cn" license=('GPL3') makedepends=('git') depends=() -conflicts=('alci-calamares-config-dev' 'alci-calamares-config-pure' 'alci-calamares-config-btrfs') provides=("${pkgname}") options=(!strip !emptydirs) -source=("bbt-calamares-config.zip") -sha256sums=('9c9e31f3671cbc9a3ff64cdb07af28626f68023713ccc7e7878357eada0ba1a3') +source=("tms-calamares-config.zip") +sha256sums=('dc68f5f82831940c84362ad3852c91cbe205bb9a9e2ef8b9e915de94f4140a2e') package() { install -dm755 ${pkgdir}${_destname1} cp -r ${srcdir}/${pkgname}${_destname1}/* ${pkgdir}${_destname1} diff --git a/bbt-calamares-config/etc/calamares/branding/default/alci.xcf b/bbt-calamares-config/etc/calamares/branding/default/alci.xcf deleted file mode 100644 index 5dbd1d7..0000000 Binary files a/bbt-calamares-config/etc/calamares/branding/default/alci.xcf and /dev/null differ diff --git a/bbt-calamares-config/etc/calamares/branding/default/alci1.xcf b/bbt-calamares-config/etc/calamares/branding/default/alci1.xcf deleted file mode 100644 index b5709cb..0000000 Binary files a/bbt-calamares-config/etc/calamares/branding/default/alci1.xcf and /dev/null differ diff --git a/build-calamares.sh b/build-calamares.sh index 4d446af..c5b544a 100755 --- a/build-calamares.sh +++ b/build-calamares.sh @@ -1,10 +1,11 @@ #!/bin/bash -rm -rf pkg src bbt-calamares-config.zip bbt-calamares-config*.pkg.tar.zst +rm -rf pkg src tms-calamares-config.zip tms-calamares-config*.pkg.tar.zst -zip -ry bbt-calamares-config.zip bbt-calamares-config +zip -ry tms-calamares-config.zip tms-calamares-config -makepkg -s +makepkg -g -mv bbt-calamares-config*.pkg.tar.zst /home/smart/tms/custompkgs/x86_64/ +echo "use makepkg -s" +#mv tms-calamares-config*.pkg.tar.zst /home/smart/tms/custompkgs/x86_64/ diff --git a/bbt-calamares-config/README.md b/tms-calamares-config/README.md similarity index 100% rename from bbt-calamares-config/README.md rename to tms-calamares-config/README.md diff --git a/bbt-calamares-config/etc/calamares/branding/default/1-welcometo.png b/tms-calamares-config/etc/calamares/branding/default/1-welcometo.png similarity index 100% rename from bbt-calamares-config/etc/calamares/branding/default/1-welcometo.png rename to tms-calamares-config/etc/calamares/branding/default/1-welcometo.png diff --git a/bbt-calamares-config/etc/calamares/branding/default/2-BBTTMS.png b/tms-calamares-config/etc/calamares/branding/default/2-BBTTMS.png similarity index 100% rename from bbt-calamares-config/etc/calamares/branding/default/2-BBTTMS.png rename to tms-calamares-config/etc/calamares/branding/default/2-BBTTMS.png diff --git a/bbt-calamares-config/etc/calamares/branding/default/BBTTMS.png b/tms-calamares-config/etc/calamares/branding/default/BBTTMS.png similarity index 100% rename from bbt-calamares-config/etc/calamares/branding/default/BBTTMS.png rename to tms-calamares-config/etc/calamares/branding/default/BBTTMS.png diff --git a/bbt-calamares-config/etc/calamares/branding/default/branding.desc b/tms-calamares-config/etc/calamares/branding/default/branding.desc similarity index 100% rename from bbt-calamares-config/etc/calamares/branding/default/branding.desc rename to tms-calamares-config/etc/calamares/branding/default/branding.desc diff --git a/bbt-calamares-config/etc/calamares/branding/default/lang/calamares-default_ar.ts b/tms-calamares-config/etc/calamares/branding/default/lang/calamares-default_ar.ts similarity index 100% rename from bbt-calamares-config/etc/calamares/branding/default/lang/calamares-default_ar.ts rename to tms-calamares-config/etc/calamares/branding/default/lang/calamares-default_ar.ts diff --git a/bbt-calamares-config/etc/calamares/branding/default/lang/calamares-default_en.ts b/tms-calamares-config/etc/calamares/branding/default/lang/calamares-default_en.ts similarity index 100% rename from bbt-calamares-config/etc/calamares/branding/default/lang/calamares-default_en.ts rename to tms-calamares-config/etc/calamares/branding/default/lang/calamares-default_en.ts diff --git a/bbt-calamares-config/etc/calamares/branding/default/lang/calamares-default_eo.ts b/tms-calamares-config/etc/calamares/branding/default/lang/calamares-default_eo.ts similarity index 100% rename from bbt-calamares-config/etc/calamares/branding/default/lang/calamares-default_eo.ts rename to tms-calamares-config/etc/calamares/branding/default/lang/calamares-default_eo.ts diff --git a/bbt-calamares-config/etc/calamares/branding/default/lang/calamares-default_fr.ts b/tms-calamares-config/etc/calamares/branding/default/lang/calamares-default_fr.ts similarity index 100% rename from bbt-calamares-config/etc/calamares/branding/default/lang/calamares-default_fr.ts rename to tms-calamares-config/etc/calamares/branding/default/lang/calamares-default_fr.ts diff --git a/bbt-calamares-config/etc/calamares/branding/default/lang/calamares-default_nl.ts b/tms-calamares-config/etc/calamares/branding/default/lang/calamares-default_nl.ts similarity index 100% rename from bbt-calamares-config/etc/calamares/branding/default/lang/calamares-default_nl.ts rename to tms-calamares-config/etc/calamares/branding/default/lang/calamares-default_nl.ts diff --git a/bbt-calamares-config/etc/calamares/branding/default/languages.png b/tms-calamares-config/etc/calamares/branding/default/languages.png similarity index 100% rename from bbt-calamares-config/etc/calamares/branding/default/languages.png rename to tms-calamares-config/etc/calamares/branding/default/languages.png diff --git a/bbt-calamares-config/etc/calamares/branding/default/languages.png.license b/tms-calamares-config/etc/calamares/branding/default/languages.png.license similarity index 100% rename from bbt-calamares-config/etc/calamares/branding/default/languages.png.license rename to tms-calamares-config/etc/calamares/branding/default/languages.png.license diff --git a/bbt-calamares-config/etc/calamares/branding/default/show.qml b/tms-calamares-config/etc/calamares/branding/default/show.qml similarity index 100% rename from bbt-calamares-config/etc/calamares/branding/default/show.qml rename to tms-calamares-config/etc/calamares/branding/default/show.qml diff --git a/bbt-calamares-config/etc/calamares/branding/default/squid.png b/tms-calamares-config/etc/calamares/branding/default/squid.png similarity index 100% rename from bbt-calamares-config/etc/calamares/branding/default/squid.png rename to tms-calamares-config/etc/calamares/branding/default/squid.png diff --git a/bbt-calamares-config/etc/calamares/branding/default/squid.png.license b/tms-calamares-config/etc/calamares/branding/default/squid.png.license similarity index 100% rename from bbt-calamares-config/etc/calamares/branding/default/squid.png.license rename to tms-calamares-config/etc/calamares/branding/default/squid.png.license diff --git a/bbt-calamares-config/etc/calamares/branding/default/stylesheet.qss b/tms-calamares-config/etc/calamares/branding/default/stylesheet.qss similarity index 100% rename from bbt-calamares-config/etc/calamares/branding/default/stylesheet.qss rename to tms-calamares-config/etc/calamares/branding/default/stylesheet.qss diff --git a/bbt-calamares-config/etc/calamares/modules/bootloader.conf b/tms-calamares-config/etc/calamares/modules/bootloader.conf similarity index 100% rename from bbt-calamares-config/etc/calamares/modules/bootloader.conf rename to tms-calamares-config/etc/calamares/modules/bootloader.conf diff --git a/bbt-calamares-config/etc/calamares/modules/displaymanager.conf b/tms-calamares-config/etc/calamares/modules/displaymanager.conf similarity index 100% rename from bbt-calamares-config/etc/calamares/modules/displaymanager.conf rename to tms-calamares-config/etc/calamares/modules/displaymanager.conf diff --git a/bbt-calamares-config/etc/calamares/modules/finished.conf b/tms-calamares-config/etc/calamares/modules/finished.conf similarity index 100% rename from bbt-calamares-config/etc/calamares/modules/finished.conf rename to tms-calamares-config/etc/calamares/modules/finished.conf diff --git a/bbt-calamares-config/etc/calamares/modules/grubcfg.conf b/tms-calamares-config/etc/calamares/modules/grubcfg.conf similarity index 100% rename from bbt-calamares-config/etc/calamares/modules/grubcfg.conf rename to tms-calamares-config/etc/calamares/modules/grubcfg.conf diff --git a/bbt-calamares-config/etc/calamares/modules/initcpio.conf b/tms-calamares-config/etc/calamares/modules/initcpio.conf similarity index 100% rename from bbt-calamares-config/etc/calamares/modules/initcpio.conf rename to tms-calamares-config/etc/calamares/modules/initcpio.conf diff --git a/bbt-calamares-config/etc/calamares/modules/locale.conf b/tms-calamares-config/etc/calamares/modules/locale.conf similarity index 100% rename from bbt-calamares-config/etc/calamares/modules/locale.conf rename to tms-calamares-config/etc/calamares/modules/locale.conf diff --git a/bbt-calamares-config/etc/calamares/modules/mount.conf b/tms-calamares-config/etc/calamares/modules/mount.conf similarity index 100% rename from bbt-calamares-config/etc/calamares/modules/mount.conf rename to tms-calamares-config/etc/calamares/modules/mount.conf diff --git a/bbt-calamares-config/etc/calamares/modules/packages.conf b/tms-calamares-config/etc/calamares/modules/packages.conf similarity index 99% rename from bbt-calamares-config/etc/calamares/modules/packages.conf rename to tms-calamares-config/etc/calamares/modules/packages.conf index 98c2b4a..407b7a3 100644 --- a/bbt-calamares-config/etc/calamares/modules/packages.conf +++ b/tms-calamares-config/etc/calamares/modules/packages.conf @@ -210,7 +210,7 @@ operations: - boost-libs - ckbcomp - calamares - - bbt-calamares-config + - tms-calamares-config - hwinfo - qt5-xmlpatterns - squashfs-tools diff --git a/bbt-calamares-config/etc/calamares/modules/partition.conf b/tms-calamares-config/etc/calamares/modules/partition.conf similarity index 100% rename from bbt-calamares-config/etc/calamares/modules/partition.conf rename to tms-calamares-config/etc/calamares/modules/partition.conf diff --git a/bbt-calamares-config/etc/calamares/modules/post-install-config.conf b/tms-calamares-config/etc/calamares/modules/post-install-config.conf similarity index 100% rename from bbt-calamares-config/etc/calamares/modules/post-install-config.conf rename to tms-calamares-config/etc/calamares/modules/post-install-config.conf diff --git a/bbt-calamares-config/etc/calamares/modules/preservefiles.conf b/tms-calamares-config/etc/calamares/modules/preservefiles.conf similarity index 100% rename from bbt-calamares-config/etc/calamares/modules/preservefiles.conf rename to tms-calamares-config/etc/calamares/modules/preservefiles.conf diff --git a/bbt-calamares-config/etc/calamares/modules/removeuser.conf b/tms-calamares-config/etc/calamares/modules/removeuser.conf similarity index 100% rename from bbt-calamares-config/etc/calamares/modules/removeuser.conf rename to tms-calamares-config/etc/calamares/modules/removeuser.conf diff --git a/bbt-calamares-config/etc/calamares/modules/shellprocess-before.conf b/tms-calamares-config/etc/calamares/modules/shellprocess-before.conf similarity index 100% rename from bbt-calamares-config/etc/calamares/modules/shellprocess-before.conf rename to tms-calamares-config/etc/calamares/modules/shellprocess-before.conf diff --git a/bbt-calamares-config/etc/calamares/modules/shellprocess-final.conf b/tms-calamares-config/etc/calamares/modules/shellprocess-final.conf similarity index 98% rename from bbt-calamares-config/etc/calamares/modules/shellprocess-final.conf rename to tms-calamares-config/etc/calamares/modules/shellprocess-final.conf index efc0d57..cc7cb50 100644 --- a/bbt-calamares-config/etc/calamares/modules/shellprocess-final.conf +++ b/tms-calamares-config/etc/calamares/modules/shellprocess-final.conf @@ -84,9 +84,8 @@ script: - "-rm ${ROOT}/root/.zlogin" - "-rm ${ROOT}/etc/polkit-1/rules.d/49-nopasswd_global.rules" - "-rm ${ROOT}/etc/polkit-1/rules.d/49-nopasswd-calamares.rules" - - "-rm ${ROOT}/usr/local/bin/alci-make-a-pure-arch" - command: "/usr/local/bin/alci-displaymanager-check" - command: "/usr/local/bin/alci-virtual-machine-check" - "-rm ${ROOT}/usr/local/bin/alci-displaymanager-check" - "-rm ${ROOT}/usr/local/bin/alci-virtual-machine-check" - - "-rm ${ROOT}/etc/systemd/system/multi-user.target.wants/sshd.service" \ No newline at end of file + - "-rm ${ROOT}/etc/systemd/system/multi-user.target.wants/sshd.service" diff --git a/bbt-calamares-config/etc/calamares/modules/unpackfs.conf b/tms-calamares-config/etc/calamares/modules/unpackfs.conf similarity index 100% rename from bbt-calamares-config/etc/calamares/modules/unpackfs.conf rename to tms-calamares-config/etc/calamares/modules/unpackfs.conf diff --git a/bbt-calamares-config/etc/calamares/modules/users.conf b/tms-calamares-config/etc/calamares/modules/users.conf similarity index 99% rename from bbt-calamares-config/etc/calamares/modules/users.conf rename to tms-calamares-config/etc/calamares/modules/users.conf index aa36cda..bd10624 100644 --- a/bbt-calamares-config/etc/calamares/modules/users.conf +++ b/tms-calamares-config/etc/calamares/modules/users.conf @@ -205,7 +205,7 @@ user: hostname: location: EtcFile writeHostsFile: true - #template: "alci-${cpu}" + #template: "bbttms-${cpu}" forbidden_names: [ localhost ] presets: diff --git a/bbt-calamares-config/etc/calamares/modules/welcome.conf b/tms-calamares-config/etc/calamares/modules/welcome.conf similarity index 100% rename from bbt-calamares-config/etc/calamares/modules/welcome.conf rename to tms-calamares-config/etc/calamares/modules/welcome.conf diff --git a/bbt-calamares-config/etc/calamares/settings.conf b/tms-calamares-config/etc/calamares/settings.conf similarity index 100% rename from bbt-calamares-config/etc/calamares/settings.conf rename to tms-calamares-config/etc/calamares/settings.conf diff --git a/up+.sh b/up+.sh index 1a6d204..e860809 100755 --- a/up+.sh +++ b/up+.sh @@ -1,34 +1,5 @@ #!/bin/bash #set -e -################################################################################################################## -# Author : Erik Dubois -# Website : https://www.erikdubois.be -# Website : https://www.alci.online -# Website : https://www.ariser.eu -# Website : https://www.arcolinux.info -# Website : https://www.arcolinux.com -# Website : https://www.arcolinuxd.com -# Website : https://www.arcolinuxb.com -# Website : https://www.arcolinuxiso.com -# Website : https://www.arcolinuxforum.com -################################################################################################################## -# -# DO NOT JUST RUN THIS. EXAMINE AND JUDGE. RUN AT YOUR OWN RISK. -# -################################################################################################################## -#tput setaf 0 = black -#tput setaf 1 = red -#tput setaf 2 = green -#tput setaf 3 = yellow -#tput setaf 4 = dark blue -#tput setaf 5 = purple -#tput setaf 6 = cyan -#tput setaf 7 = gray -#tput setaf 8 = light blue -################################################################################################################## - -# reset - commit your changes or stash them before you merge -# git reset --hard - personal alias - grh echo "Deleting the work folder if one exists" [ -d work ] && rm -rf work