fix some
This commit is contained in:
@@ -1,20 +1,5 @@
|
||||
#!/bin/bash
|
||||
#set -e
|
||||
##################################################################################################################
|
||||
# Author : Erik Dubois
|
||||
# Website : https://www.erikdubois.online
|
||||
# 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
|
||||
# Website : https://www.alci.online
|
||||
##################################################################################################################
|
||||
#
|
||||
# DO NOT JUST RUN THIS. EXAMINE AND JUDGE. RUN AT YOUR OWN RISK.
|
||||
#
|
||||
##################################################################################################################
|
||||
|
||||
# 获取脚本所在的目录
|
||||
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
|
||||
@@ -166,97 +151,6 @@ echo
|
||||
#cp -r ../archiso $buildFolder/archiso
|
||||
cp -r "$PROJECT_ROOT/archiso" "$buildFolder/archiso"
|
||||
|
||||
# echo
|
||||
# echo "################################################################## "
|
||||
# tput setaf 2
|
||||
# echo "Phase 4 :"
|
||||
# echo "- Deleting any files in /etc/skel"
|
||||
# echo "- Getting the last version of bashrc in /etc/skel"
|
||||
# echo "- Removing the old packages.x86_64 file from build folder"
|
||||
# echo "- Copying the new packages.x86_64 file to the build folder"
|
||||
# echo "- Changing group for polkit folder"
|
||||
# tput sgr0
|
||||
# echo "################################################################## "
|
||||
# echo
|
||||
|
||||
# echo "Deleting any files in /etc/skel"
|
||||
# rm -rf $buildFolder/archiso/airootfs/etc/skel/.* 2> /dev/null
|
||||
# echo
|
||||
|
||||
# echo "Getting the last version of bashrc in /etc/skel"
|
||||
# echo
|
||||
# wget https://raw.githubusercontent.com/arcolinux/arcolinux-root/master/etc/skel/.bashrc-latest -O $buildFolder/archiso/airootfs/etc/skel/.bashrc
|
||||
|
||||
# echo "Removing the old packages.x86_64 file from build folder"
|
||||
# rm $buildFolder/archiso/packages.x86_64
|
||||
# echo
|
||||
# echo "Copying the new packages.x86_64 file to the build folder"
|
||||
# cp -f ../archiso/packages.x86_64 $buildFolder/archiso/packages.x86_64
|
||||
# echo
|
||||
# echo "Changing group for polkit folder"
|
||||
# sudo chgrp polkitd $buildFolder/archiso/airootfs/etc/polkit-1/rules.d
|
||||
# #is not working so fixing this during calamares installation
|
||||
|
||||
# echo
|
||||
# echo "################################################################## "
|
||||
# tput setaf 2
|
||||
# echo "Phase 5 : "
|
||||
# echo "- Changing all references"
|
||||
# echo "- Adding time to /etc/dev-rel"
|
||||
# tput sgr0
|
||||
# echo "################################################################## "
|
||||
# echo
|
||||
#
|
||||
# #Setting variables
|
||||
#
|
||||
# #profiledef.sh
|
||||
# oldname1='iso_name=arcolinux'
|
||||
# newname1='iso_name=arcolinux'
|
||||
#
|
||||
# oldname2='iso_label="arcolinux'
|
||||
# newname2='iso_label="arcolinux'
|
||||
#
|
||||
# oldname3='ArcoLinux'
|
||||
# newname3='ArcoLinux'
|
||||
#
|
||||
# #hostname
|
||||
# oldname4='ArcoLinux'
|
||||
# newname4='ArcoLinux'
|
||||
#
|
||||
# #lightdm.conf user-session
|
||||
# oldname5='user-session=xfce'
|
||||
# newname5='user-session='$lightdmDesktop
|
||||
#
|
||||
# #lightdm.conf autologin-session
|
||||
# oldname6='#autologin-session='
|
||||
# newname6='autologin-session='$lightdmDesktop
|
||||
#
|
||||
# echo "Changing all references"
|
||||
# echo
|
||||
# sed -i 's/'$oldname1'/'$newname1'/g' $buildFolder/archiso/profiledef.sh
|
||||
# sed -i 's/'$oldname2'/'$newname2'/g' $buildFolder/archiso/profiledef.sh
|
||||
# sed -i 's/'$oldname3'/'$newname3'/g' $buildFolder/archiso/airootfs/etc/dev-rel
|
||||
# sed -i 's/'$oldname4'/'$newname4'/g' $buildFolder/archiso/airootfs/etc/hostname
|
||||
# sed -i 's/'$oldname5'/'$newname5'/g' $buildFolder/archiso/airootfs/etc/lightdm/lightdm.conf
|
||||
# sed -i 's/'$oldname6'/'$newname6'/g' $buildFolder/archiso/airootfs/etc/lightdm/lightdm.conf
|
||||
#
|
||||
# echo "Adding time to /etc/dev-rel"
|
||||
# date_build=$(date -d now)
|
||||
# echo "Iso build on : "$date_build
|
||||
# sudo sed -i "s/\(^ISO_BUILD=\).*/\1$date_build/" $buildFolder/archiso/airootfs/etc/dev-rel
|
||||
|
||||
|
||||
#echo
|
||||
#echo "################################################################## "
|
||||
#tput setaf 2
|
||||
#echo "Phase 6 :"
|
||||
#echo "- Cleaning the cache from /var/cache/pacman/pkg/"
|
||||
#tput sgr0
|
||||
#echo "################################################################## "
|
||||
#echo
|
||||
|
||||
#echo "Cleaning the cache from /var/cache/pacman/pkg/"
|
||||
#yes | sudo pacman -Scc
|
||||
|
||||
echo
|
||||
echo "################################################################## "
|
||||
@@ -271,51 +165,11 @@ echo
|
||||
cd $buildFolder/archiso/
|
||||
sudo mkarchiso -v -w $buildFolder -o $outFolder $buildFolder/archiso/
|
||||
|
||||
|
||||
|
||||
# echo
|
||||
# echo "###################################################################"
|
||||
# tput setaf 2
|
||||
# echo "Phase 8 :"
|
||||
# echo "- Creating checksums"
|
||||
# echo "- Copying pgklist"
|
||||
# tput sgr0
|
||||
# echo "###################################################################"
|
||||
# echo
|
||||
#
|
||||
# cd $outFolder
|
||||
#
|
||||
# echo "Creating checksums for : "$isoLabel
|
||||
# echo "##################################################################"
|
||||
# echo
|
||||
# echo "Building sha1sum"
|
||||
# echo "########################"
|
||||
# sha1sum $isoLabel | tee $isoLabel.sha1
|
||||
# echo "Building sha256sum"
|
||||
# echo "########################"
|
||||
# sha256sum $isoLabel | tee $isoLabel.sha256
|
||||
# echo "Building md5sum"
|
||||
# echo "########################"
|
||||
# md5sum $isoLabel | tee $isoLabel.md5
|
||||
# echo
|
||||
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 "Phase 9 :"
|
||||
#echo "- Making sure we start with a clean slate next time"
|
||||
#tput sgr0
|
||||
#echo "################################################################## "
|
||||
#echo
|
||||
|
||||
#echo "Deleting the build folder if one exists - takes some time"
|
||||
#[ -d $buildFolder ] && sudo rm -rf $buildFolder
|
||||
|
||||
echo
|
||||
echo "##################################################################"
|
||||
tput setaf 2
|
||||
|
||||
Reference in New Issue
Block a user