diff --git a/archiso/airootfs/home/liveuser/.config/xfce4/panel/launcher-14/17674322642.desktop b/archiso/airootfs/home/liveuser/.config/xfce4/panel/launcher-14/17674322642.desktop new file mode 100644 index 0000000..dc75d1b --- /dev/null +++ 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 diff --git a/archiso/airootfs/home/liveuser/.config/xfce4/panel/launcher-16/17674322803.desktop b/archiso/airootfs/home/liveuser/.config/xfce4/panel/launcher-16/17674322803.desktop new file mode 100644 index 0000000..4f266d7 --- /dev/null +++ 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 diff --git a/archiso/airootfs/home/liveuser/.config/xfce4/panel/launcher-4/17674322451.desktop b/archiso/airootfs/home/liveuser/.config/xfce4/panel/launcher-4/17674322451.desktop new file mode 100644 index 0000000..458f15a --- /dev/null +++ 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 diff --git 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 index 0684879..6c5e951 100644 --- 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 @@ + @@ -34,17 +35,30 @@ - - + + + - + + + - + + + + + + + + + + + @@ -56,14 +70,22 @@ + + + - + + + + + + @@ -80,25 +102,27 @@ + + + + + - - - - - - - - - - - + + + + + + + + diff --git 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 index 7f01451..6c5e951 100644 --- 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 @@ - + + + diff --git a/archiso/pacman.conf b/archiso/pacman.conf index 1f0dae4..a9b16cf 100755 --- 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 diff --git 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 new file mode 100755 index 0000000..ac39ebc --- /dev/null +++ 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