update

2026-01-03 17:28:46 +08:00
parent ed003457b8
commit e7b4bdb3cb
7 changed files with 272 additions and 19 deletions
--- a/archiso/airootfs/home/liveuser/.config/xfce4/panel/launcher-14/17674322642.desktop
+++ b/archiso/airootfs/home/liveuser/.config/xfce4/panel/launcher-14/17674322642.desktop
@@ -0,0 +1,16 @@
+[Desktop Entry]
+Type=Application
+Name=KDE Partition Manager
+Name[zh_CN]=KDE 分区管理器
+GenericName=Partition Editor
+GenericName[zh_CN]=分区编辑器
+Comment=Manage disks, partitions, and file systems
+Comment[zh_CN]=管理磁盘、分区和文件系统
+Exec=partitionmanager
+Icon=partitionmanager
+Categories=System;Filesystem;KDE;Qt;
+SingleMainWindow=true
+StartupNotify=true
+Keywords=partition;disk;
+Keywords[zh_CN]=partition;disk;分区;磁盘;fenqu;cipan;
+X-XFCE-Source=file:///usr/share/applications/org.kde.partitionmanager.desktop
--- a/archiso/airootfs/home/liveuser/.config/xfce4/panel/launcher-16/17674322803.desktop
+++ b/archiso/airootfs/home/liveuser/.config/xfce4/panel/launcher-16/17674322803.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Type=Application
+Categories=Network;
+Name=TeamViewer
+Comment=Remote control solution.
+Exec=/opt/teamviewer/tv_bin/script/teamviewer
+StartupWMClass=TeamViewer
+Icon=TeamViewer
+X-XFCE-Source=file:///opt/teamviewer/tv_bin/desktop/com.teamviewer.TeamViewer.desktop
--- a/archiso/airootfs/home/liveuser/.config/xfce4/panel/launcher-4/17674322451.desktop
+++ b/archiso/airootfs/home/liveuser/.config/xfce4/panel/launcher-4/17674322451.desktop
@@ -0,0 +1,19 @@
+[Desktop Entry]
+Type=Application
+Version=1.0
+Name=Install System
+GenericName=System Installer
+Keywords=calamares;system;installer;
+TryExec=calamares
+Exec=sh -c "pkexec calamares"
+Comment=Calamares — System Installer
+Icon=calamares
+Terminal=false
+StartupNotify=true
+Categories=Qt;System;
+X-AppStream-Ignore=true
+Name[zh_CN]=安装系统
+Icon[zh_CN]=calamares
+GenericName[zh_CN]=系统安装程序
+Comment[zh_CN]=Calamares — 系统安装程序
+X-XFCE-Source=file:///usr/share/applications/calamares.desktop
--- a/archiso/airootfs/home/liveuser/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
+++ b/archiso/airootfs/home/liveuser/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
@@ -18,6 +18,7 @@
        <value type="int" value="3"/>
        <value type="int" value="5"/>
        <value type="int" value="6"/>
+        <value type="int" value="21"/>
        <value type="int" value="7"/>
        <value type="int" value="8"/>
        <value type="int" value="9"/>
@@ -34,17 +35,30 @@
        <value type="int" value="11"/>
        <value type="int" value="12"/>
        <value type="int" value="13"/>
-        <value type="int" value="15"/>
-        <value type="int" value="4"/>
        <value type="int" value="14"/>
+        <value type="int" value="15"/>
        <value type="int" value="16"/>
+        <value type="int" value="17"/>
+        <value type="int" value="18"/>
      </property>
    </property>
  </property>
  <property name="plugins" type="empty">
-    <property name="plugin-1" type="string" value="applicationsmenu"/>
+    <property name="plugin-1" type="string" value="applicationsmenu">
+      <property name="button-icon" type="string" value="/usr/share/grub/themes/tms/icons/bbttms.png"/>
+    </property>
    <property name="plugin-2" type="string" value="tasklist">
-      <property name="grouping" type="uint" value="1"/>
+      <property name="grouping" type="bool" value="false"/>
+      <property name="flat-buttons" type="bool" value="false"/>
+      <property name="show-labels" type="bool" value="true"/>
+      <property name="show-handle" type="bool" value="false"/>
+      <property name="show-tooltips" type="bool" value="true"/>
+      <property name="sort-order" type="uint" value="1"/>
+      <property name="middle-click" type="uint" value="1"/>
+      <property name="show-wireframes" type="bool" value="false"/>
+      <property name="include-all-workspaces" type="bool" value="true"/>
+      <property name="show-only-minimized" type="bool" value="false"/>
+      <property name="include-all-monitors" type="bool" value="true"/>
    </property>
    <property name="plugin-3" type="string" value="separator">
      <property name="expand" type="bool" value="true"/>
@@ -56,14 +70,22 @@
    <property name="plugin-6" type="string" value="systray">
      <property name="square-icons" type="bool" value="true"/>
      <property name="known-items" type="array">
+        <value type="string" value="baidunetdisk1"/>
+        <value type="string" value="remmina-icon"/>
+        <value type="string" value="ToDesk"/>
        <value type="string" value="sunlogin-client"/>
        <value type="string" value="Fcitx"/>
        <value type="string" value="TeamViewer"/>
      </property>
      <property name="known-legacy-items" type="array">
-        <value type="string" value="networkmanager applet"/>
+        <value type="string" value="以太网连接“有线连接 3”已激活"/>
        <value type="string" value="以太网连接“有线连接 1”已激活"/>
      </property>
+      <property name="hide-new-items" type="bool" value="false"/>
+      <property name="single-row" type="bool" value="false"/>
+      <property name="icon-size" type="int" value="22"/>
+      <property name="menu-is-primary" type="bool" value="false"/>
+      <property name="symbolic-icons" type="bool" value="false"/>
    </property>
    <property name="plugin-7" type="string" value="separator">
      <property name="style" type="uint" value="0"/>
@@ -80,25 +102,27 @@
        <value type="string" value="17637208851.desktop"/>
      </property>
    </property>
+    <property name="plugin-14" type="string" value="launcher">
+      <property name="items" type="array">
+        <value type="string" value="17637208852.desktop"/>
+      </property>
+    </property>
    <property name="plugin-15" type="string" value="launcher">
      <property name="items" type="array">
        <value type="string" value="17637208853.desktop"/>
      </property>
    </property>
-    <property name="plugin-4" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="17674216101.desktop"/>
-      </property>
-    </property>
-    <property name="plugin-14" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="17674216243.desktop"/>
-      </property>
-    </property>
    <property name="plugin-16" type="string" value="launcher">
      <property name="items" type="array">
-        <value type="string" value="17674216454.desktop"/>
+        <value type="string" value="17637208864.desktop"/>
      </property>
    </property>
+    <property name="plugin-17" type="string" value="separator"/>
+    <property name="plugin-18" type="string" value="directorymenu">
+      <property name="base-directory" type="string" value="/home/smart"/>
+    </property>
+    <property name="plugin-21" type="string" value="pulseaudio">
+      <property name="enable-keyboard-shortcuts" type="bool" value="true"/>
+    </property>
  </property>
 </channel>
--- a/archiso/airootfs/home/smart/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
+++ b/archiso/airootfs/home/smart/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
@@ -44,7 +44,9 @@
    </property>
  </property>
  <property name="plugins" type="empty">
-    <property name="plugin-1" type="string" value="applicationsmenu"/>
+    <property name="plugin-1" type="string" value="applicationsmenu">
+      <property name="button-icon" type="string" value="/usr/share/grub/themes/tms/icons/bbttms.png"/>
+    </property>
    <property name="plugin-2" type="string" value="tasklist">
      <property name="grouping" type="bool" value="false"/>
      <property name="flat-buttons" type="bool" value="false"/>
--- a/archiso/pacman.conf
+++ b/archiso/pacman.conf
@@ -77,9 +77,9 @@ LocalFileSigLevel = Optional

 [custom]
 SigLevel = Optional TrustAll
-Server = http://192.168.10.207:3000/zj/custompkgs/raw/x86_64/
+#Server = http://192.168.10.207:3000/zj/custompkgs/raw/x86_64/
 #Server = https://mirror.yuyujing.cn/archlinux/os/$arch
-#Server = http://192.168.1.56:5255/d/mirrors/archlinux/os/x86_64
+Server = http://192.168.1.56:5255/d/mirrors/archlinux/os/x86_64

 [core]
 Include = /etc/pacman.d/mirrorlist
--- a/installation-scripts/tms-40-build-the-iso-local-again-use-custom-mkarchiso.sh
+++ b/installation-scripts/tms-40-build-the-iso-local-again-use-custom-mkarchiso.sh
@@ -0,0 +1,181 @@
+#!/bin/bash
+#set -e
+
+# 获取当前脚本的绝对路径所在的目录
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
+# 定义同目录下的 mkarchiso 可执行文件的路径
+MKARCHISO_PATH="$SCRIPT_DIR/mkarchiso"
+PROJECT_ROOT="$( dirname "$SCRIPT_DIR" )"
+
+
+export SCRIPT_DIR
+export PROJECT_ROOT
+
+
+if 	lsblk -f | grep btrfs > /dev/null 2>&1 ; then
+	echo
+	echo "################################################################## "
+	tput setaf 3
+	echo "Message"
+    echo "This script has been known to cause issues on a Btrfs filesystem"
+    echo "Make backups before continuing"
+    echo "Continu at your own risk"
+    tput sgr0
+    echo
+    read -p "Press Enter to continue... CTRL + C to stop"
+fi
+
+echo
+echo "################################################################## "
+tput setaf 2
+echo "Phase 1 : "
+echo "- Setting General parameters"
+tput sgr0
+echo "################################################################## "
+echo
+
+	# setting of the general parameters
+	archisoRequiredVersion="archiso 83-1"
+	buildFolder=$HOME"/bbttms-build"
+	# outFolder=$HOME"/Bbttms-Iso-Out"
+	outFolder="/media/cinema/Bbttms-Iso-Out"
+	archisoVersion=$(sudo pacman -Q archiso)
+
+	echo "################################################################## "
+	#echo "Building the desktop                   : "$desktop
+	#echo "Building version                       : "$arcolinuxVersion
+	#echo "Iso label                              : "$isoLabel
+	echo "Do you have the right archiso version? : "$archisoVersion
+	echo "What is the required archiso version?  : "$archisoRequiredVersion
+	echo "Build folder                           : "$buildFolder
+	echo "Out folder                             : "$outFolder
+	echo "################################################################## "
+
+	if [ "$archisoVersion" == "$archisoRequiredVersion" ]; then
+		tput setaf 2
+		echo "##################################################################"
+		echo "Archiso has the correct version. Continuing ..."
+		echo "##################################################################"
+		tput sgr0
+	else
+	tput setaf 1
+	echo "###################################################################################################"
+	echo "You need to install the correct version of Archiso"
+	echo "Use 'sudo downgrade archiso' to do that"
+	echo "or update your system"
+	echo "If a new archiso package comes in and you want to test if you can still build"
+	echo "the iso then change the version in line 37."
+	echo "###################################################################################################"
+	tput sgr0
+	fi
+
+echo
+echo "################################################################## "
+tput setaf 2
+echo "Phase 2 :"
+echo "- Checking if archiso is installed"
+echo "- Saving current archiso version to archiso.md"
+echo "- Making mkarchiso verbose"
+tput sgr0
+echo "################################################################## "
+echo
+
+	package="archiso"
+
+	#----------------------------------------------------------------------------------
+
+	#checking if application is already installed or else install with aur helpers
+	if pacman -Qi $package &> /dev/null; then
+
+			echo "Archiso is already installed"
+
+	else
+
+		#checking which helper is installed
+		if pacman -Qi yay &> /dev/null; then
+
+			echo "################################################################"
+			echo "######### Installing with yay"
+			echo "################################################################"
+			yay -S --noconfirm $package
+
+		elif pacman -Qi trizen &> /dev/null; then
+
+			echo "################################################################"
+			echo "######### Installing with trizen"
+			echo "################################################################"
+			trizen -S --noconfirm --needed --noedit $package
+
+		fi
+
+		# Just checking if installation was successful
+		if pacman -Qi $package &> /dev/null; then
+
+			echo "################################################################"
+			echo "#########  "$package" has been installed"
+			echo "################################################################"
+
+		else
+
+			echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+			echo "!!!!!!!!!  "$package" has NOT been installed"
+			echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+			exit 1
+		fi
+
+	fi
+
+	echo
+	echo "Saving current archiso version to archiso.md"
+	sudo sed -i "s/\(^archiso-version=\).*/\1$archisoVersion/" "$PROJECT_ROOT/archiso.md"
+	echo
+	echo "Making mkarchiso verbose"
+	# 注意：这里修改的是系统安装的 mkarchiso 脚本，如果你希望修改的是同目录下的 mkarchiso，则需要调整路径
+	sudo sed -i 's/quiet="y"/quiet="n"/g' /usr/bin/mkarchiso
+
+echo
+echo "################################################################## "
+tput setaf 2
+echo "Phase 3 :"
+echo "- Deleting the build folder if one exists"
+echo "- Copying the Archiso folder to build folder"
+tput sgr0
+echo "################################################################## "
+echo
+
+	echo "Deleting the build folder if one exists - takes some time"
+	[ -d $buildFolder ] && sudo rm -rf $buildFolder
+	echo
+	echo "Copying the Archiso folder to build work"
+	echo
+	mkdir "$buildFolder" # 加上双引号以防路径中含空格
+	cp -r "$PROJECT_ROOT/archiso" "$buildFolder/archiso" # 加上双引号以防路径中含空格
+
+echo
+echo "################################################################## "
+tput setaf 2
+echo "Phase 7 :"
+echo "- Building the iso - this can take a while - be patient"
+tput sgr0
+echo "################################################################## "
+echo
+
+	[ -d "$outFolder" ] || mkdir -p "$outFolder" # 加上双引号并使用 -p
+	cd "$buildFolder/archiso/" # 加上双引号
+	# 使用 $MKARCHISO_PATH 确保调用的是同目录下的 mkarchiso
+	sudo "$MKARCHISO_PATH" -v -w "$buildFolder" -o "$outFolder" "$buildFolder/archiso/"
+
+ 	echo "Moving pkglist.x86_64.txt"
+ 	echo "########################"
+	rename=$(date +%Y-%m-%d)
+ 	cp "$buildFolder/iso/BBTTMS/pkglist.x86_64.txt" "$outFolder/BBTTMS-$rename-pkglist.txt" # 加上双引号
+
+
+echo
+echo "##################################################################"
+tput setaf 2
+echo "DONE"
+echo "- Check your out folder :"$outFolder
+tput sgr0
+echo "################################################################## "
+echo