Merge pull request #125 from tcet-opensource/117-add-script-which-helps-to-building-iso

Akash6222 · web-flow · commit ec36753d2efd · 2023-12-23T02:03:57.000+05:30
117 add script which helps to building iso
diff --git a/.github/workflows/iso-build.yml b/.github/workflows/iso-build.yml
@@ -16,13 +16,13 @@ jobs:
       options: --privileged
       
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set current date as environment variable
         run: echo "DATE=`date +'%Y.%m.%d'`" >>$GITHUB_ENV
         
       - name: Synchronise package repositories and install archiso
-        run: pacman -Syu --noconfirm archiso git archlinux-keyring reflector wget
+        run: pacman -Syu --noconfirm archiso git archlinux-keyring wget reflector --needed
         
       - name: Running Reflector
         run: |
@@ -33,20 +33,41 @@ jobs:
           --latest 5 \
           --save /etc/pacman.d/mirrorlist
           pacman -Syu
+
+      - name: Setting Up Keyring
+        run: |
+          pacman-key --init
+          pacman-key --keyserver keyserver.ubuntu.com -r 280178FA27665D44
+          pacman-key --lsign-key 280178FA27665D44
+          pacman-key --keyserver keyserver.ubuntu.com -r 421FFABA41F36DA5
+          pacman-key --lsign-key 421FFABA41F36DA5
+          pacman-key --keyserver keyserver.ubuntu.com -r 02F660CD5FA77EBB
+          pacman-key --lsign-key 02F660CD5FA77EBB
+          pacman-key --keyserver keyserver.ubuntu.com -r BF4E1E687DD0A534
+          pacman-key --lsign-key BF4E1E687DD0A534
           
       - name: Building TCET Linux ISO
         run: |
+            ls -al
             pacman -Syu
             wget https://raw.githubusercontent.com/tcet-opensource/tcet-linux/main/pacman.conf -O /etc/pacman.conf
             mkarchiso -v -w ./work -o ./out ./
             echo "ISO Built in ./out folder!"
+            ls -al
+      
+      - name: Generating Checksum
+        run: |
+          ls -al
+          cd out/
+          touch checksum
+          sha256sum  *.iso > checksum
+          ls -al
             
       - name: Release ISO File
         uses: ncipollo/release-action@v1
         with:
-            artifacts: "out/*.iso"
+            artifacts: "out/*.iso,out/checksum"
             body: "v2.0.0"
             generateReleaseNotes: false
             name: "TCET-Linux"
             tag: ${{ env.DATE }}
-            
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # TCET Linux
 
-![TCET LINUX](https://github.com/tcet-opensource/tcet-linux-assets/blob/main/tcet-linux.png)
+![TCET LINUX](https://raw.githubusercontent.com/tcet-opensource/artwork/main/tcet-linux/tcet-linux.png)
 
 ## What is TCET Linux?
 **[TCET Linux](https://linux.tcetmumbai.in/)** is an **open-source operating system** providing basic services, and various software packages that make up the user-space applications, utilities and it is highly customized. Our goal in creating this operating system is to provide a platform that combines **robust functionality** with a **user-friendly experience**. Built from the ground up, TCET Linux boasts **efficient performance**, **customization options**, and a range of features tailored to meet the needs of both casual users and enthusiasts.
@@ -14,7 +14,7 @@
 * Atleast 8GB HDD/SSD storage.
 * Basic WPA/WPA2 compatible wifi card or ethernet supported motherboard.
 
-![installer](https://github.com/tcet-opensource/tcet-linux-assets/blob/main/installer.png)
+![installer](https://raw.githubusercontent.com/tcet-opensource/artwork/main/tcet-linux/installer.png)
 
 The complete process for the installation is given in details on the website of **[TCET Linux](https://linux.tcetmumbai.in/)**.
 
@@ -23,7 +23,7 @@ The complete process for the installation is given in details on the website of
 ## Welcome App
 The welcome app provides the user with the important links and shortcuts to some features and the installer.
 
-![Welcomeapp](https://github.com/tcet-opensource/tcet-linux-assets/blob/main/welcome-app.png)
+![Welcomeapp](https://raw.githubusercontent.com/tcet-opensource/artwork/main/tcet-linux/welcome-app.png)
 
 It includes the following options:
 * **Install TCET Linux**: This starts the TCET Linux Installer
@@ -96,13 +96,60 @@ Packages in TCET Linux is managed by package manager.
 
 <br />
 
-## Glimpses of TCET Linux
+# Glimpses of TCET Linux
 
-![tcet-linux-desktop](https://github.com/tcet-opensource/tcet-linux-assets/blob/main/tcet-linux_desktop1.png)
+![tcet-linux-desktop](https://raw.githubusercontent.com/tcet-opensource/artwork/main/tcet-linux/tcet-linux-desktop1.png)
 
 
 <br />
 
+# How to build ISO
+
+## Install required package
+```bash
+sudo pacman -S archiso
+```
+
+## Clone repository
+```bash
+git clone https://github.com/tcet-opensource/tcet-linux.git
+```
+
+## Build ( Using Script )
+```bash
+cd tcet-linux
+./buildiso
+```
+OR
+## Build ( Manually )
+### Setup Keys
+```bash
+# Akash6222
+sudo pacman-key --keyserver keyserver.ubuntu.com -r 280178FA27665D44
+sudo pacman-key --lsign-key 280178FA27665D44
+
+# Rishabh672003
+sudo pacman-key --keyserver keyserver.ubuntu.com -r 421FFABA41F36DA5
+sudo pacman-key --lsign-key 421FFABA41F36DA5
+
+# 0xAtharv
+sudo pacman-key --keyserver keyserver.ubuntu.com -r 02F660CD5FA77EBB
+sudo pacman-key --lsign-key 02F660CD5FA77EBB
+
+# harshau007
+sudo pacman-key --keyserver keyserver.ubuntu.com -r BF4E1E687DD0A534
+sudo pacman-key --lsign-key BF4E1E687DD0A534
+
+```
+### Build ISO
+```bash
+cd tcet-linux
+sudo mkarchiso -v .
+```
+
+## ISO will appear in `work/out/` directory
+<br />
+
 ## Important Links:
 
 - [TCET Linux Website](https://linux.tcetmumbai.in/)
diff --git a/airootfs/etc/default/grub b/airootfs/etc/default/grub
@@ -43,7 +43,7 @@ GRUB_DISABLE_RECOVERY=true
 #GRUB_COLOR_HIGHLIGHT="light-cyan/black"
 
 # Uncomment one of them for the gfx desired, a image background or a gfxtheme
-GRUB_BACKGROUND="/usr/share/backgrounds/xfce/wallpaper4.png"
+GRUB_BACKGROUND="/usr/share/backgrounds/xfce/tcet-linux/wallpaper4.png"
 #GRUB_THEME=
 
 # Uncomment to get a beep at GRUB start
diff --git a/airootfs/etc/lightdm/lightdm-gtk-greeter.conf b/airootfs/etc/lightdm/lightdm-gtk-greeter.conf
@@ -48,7 +48,7 @@
 #  transition-duration = overrides default value
 #
 [greeter]
-background=/usr/share/backgrounds/xfce/wallpaper5.png
+background=/usr/share/backgrounds/xfce/tcet-linux/wallpaper5.png
 #user-background=
 theme-name=Qogir-Dark
 icon-theme-name=tela-circle-icon
diff --git a/airootfs/etc/pacman.conf b/airootfs/etc/pacman.conf
@@ -97,4 +97,4 @@ Include = /etc/pacman.d/mirrorlist
 
 [tcet-linux-repo]
 SigLevel = Optional TrustedOnly
-Server = https://tcet-opensource.github.io/$repo/$arch
+Include = /etc/pacman.d/tcet-linux-mirrorlist
diff --git a/buildiso b/buildiso
@@ -0,0 +1,63 @@
+#!/bin/bash
+
+echo "Installing archsio"
+sudo pacman -Sy archiso --needed
+
+if [ -d "work" ] || [ -d "out" ]; then
+  sudo rm -rf work/ out/
+fi
+
+echo "Setting up Keyring"	
+
+if [ !$(sudo pacman-key -l | grep -E "280178FA27665D44") ]; then
+	# Akash6222
+    sudo pacman-key --keyserver keyserver.ubuntu.com -r 280178FA27665D44
+	sudo pacman-key --lsign-key 280178FA27665D44
+fi
+
+if [ !$(sudo pacman-key -l | grep -E "421FFABA41F36DA5") ]; then
+	# Rishabh672003
+	sudo pacman-key --keyserver keyserver.ubuntu.com -r 421FFABA41F36DA5
+	sudo pacman-key --lsign-key 421FFABA41F36DA5
+fi
+
+if [ !$(sudo pacman-key -l | grep -E "02F660CD5FA77EBB") ]; then
+	# 0xAtharv
+	sudo pacman-key --keyserver keyserver.ubuntu.com -r 02F660CD5FA77EBB
+	sudo pacman-key --lsign-key 02F660CD5FA77EBB
+fi
+
+if [ !$(sudo pacman-key -l | grep -E "BF4E1E687DD0A534") ]; then
+	# harshau007
+	sudo pacman-key --keyserver keyserver.ubuntu.com -r BF4E1E687DD0A534
+	sudo pacman-key --lsign-key BF4E1E687DD0A534
+fi
+
+
+echo "Building Iso"
+echo "Warning don't press ctrl+c or ctrl+z when iso is building"
+sudo mkarchiso -v -w ./work -o ./out ./
+
+echo "Do you want to remove tcet-linux-keyring from your system [y/n]"
+read answer
+
+if [ "$answer" == "y" ] || [ "$answer" == "yes" ]; then
+	echo "Removing tcet-linux-keyring."
+	#  Akash6222
+	sudo pacman-key --delete 280178FA27665D44
+
+	#  Rishabh672003
+	sudo pacman-key --delete 421FFABA41F36DA5
+
+	#  0xAtharv
+	sudo pacman-key --delete 02F660CD5FA77EBB
+
+	# harshau007
+	sudo pacman-key --delete BF4E1E687DD0A534
+elif [ "$answer" == "n" ] || [ "$answer" == "no" ]; then
+	echo "tcet-linux-keyring present in your system."
+	exit 0
+else
+	echo "Invalid input. Please enter 'y' or 'n'."
+	exit 1
+fi
diff --git a/cleanup.sh b/cleanup.sh
@@ -1 +1 @@
-sudo rm -rvf work/ out/ 
+sudo rm -rvf work/ out/ tcet-linux-keyring*
diff --git a/contributing.md b/contributing.md
@@ -0,0 +1,71 @@
+# Welcome to TCET Linux contributing guide
+
+Thank you for investing your time in contributing to our project! Any contribution you make will be reflected from our next release :sparkles:.
+
+Read our [Code of Conduct](https://github.com/tcet-opensource/.github/blob/main/CODE_OF_CONDUCT.md) to keep our community approachable and respectable.
+
+In this guide you will get an overview of the contribution workflow from opening an issue, creating a PR, reviewing, and merging the PR.
+
+## New contributor guide
+
+To get an overview of the project, read the [README](https://github.com/tcet-opensource/tcet-linux/blob/main/README.md) file. Here are some resources to help you get started with open source contributions:
+
+- [Contributing to TCET-Opensource Externally](https://opensource.tcetmumbai.in/docs/resources/workflows/external-workflow/)
+- [Set up Git](https://docs.github.com/en/get-started/quickstart/set-up-git)
+- [GitHub flow](https://docs.github.com/en/get-started/quickstart/github-flow)
+
+
+## Getting started
+
+To navigate our codebase with confidence, see documentation of [TCET Linux](https://opensource.tcetmumbai.in/docs/projects/tcet-linux/about-tcet-linux/) :confetti_ball:.
+
+### Issues
+
+#### Create a new issue
+
+If you spot a problem, [search if an issue already exists](https://github.com/tcet-opensource/tcet-linux/issues). If a related issue doesn't exist, you can open a new issue using a relevant [issue form](https://github.com/tcet-opensource/tcet-linux/issues).
+
+#### Solve an issue
+
+1. Scan through our [existing issues](https://github.com/tcet-opensource/tcet-linux/issues) to find one that interests you. You can narrow down the search using `labels` as filters. 
+
+2. See [Good First Issues](https://github.com/tcet-opensource/tcet-linux/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22) label for beginner issues. 
+
+3. Leave a comment to get it assigned.
+
+### Make Changes
+
+1. Fork the repository.
+- Using GitHub Desktop:
+  - [Getting started with GitHub Desktop](https://docs.github.com/en/desktop/installing-and-configuring-github-desktop/getting-started-with-github-desktop) will guide you through setting up Desktop.
+  - Once Desktop is set up, you can use it to [fork the repo](https://docs.github.com/en/desktop/contributing-and-collaborating-using-github-desktop/cloning-and-forking-repositories-from-github-desktop)!
+
+- Using the command line:
+  - [Fork the repo](https://docs.github.com/en/github/getting-started-with-github/fork-a-repo#fork-an-example-repository) so that you can make your changes without affecting the original project until you're ready to merge them.
+
+2. Install or update **archiso**, for creating ISO. For more information, see [How to build ISO](https://github.com/tcet-opensource/tcet-linux/tree/main#how-to-build-iso).
+
+3. Create a working branch and start with your changes!
+
+### Commit your update
+
+Commit the changes once you are happy with them. Don't forget to [self-review](/contributing/self-review.md) to speed up the review process:zap:.
+
+### Pull Request
+
+When you're finished with the changes, create a pull request, also known as a PR.
+- Fill the PR template so that we can review your PR. This template helps reviewers understand your changes as well as the purpose of your pull request.
+- Don't forget to [link PR to issue](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue) if you are solving one.
+- Enable the checkbox to [allow maintainer edits](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/allowing-changes-to-a-pull-request-branch-created-from-a-fork) so the branch can be updated for a merge.
+Once you submit your PR, a DevOps team member will review your proposal. We may ask questions or request additional information.
+- We may ask for changes to be made before a PR can be merged, either using [suggested changes](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/incorporating-feedback-in-your-pull-request) or pull request comments. You can apply suggested changes directly through the UI. You can make any other changes in your fork, then commit them to your branch.
+- As you update your PR and apply changes, mark each conversation as [resolved](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/commenting-on-a-pull-request#resolving-conversations).
+- If you run into any merge issues, checkout this [git tutorial](https://github.com/skills/resolve-merge-conflicts) to help you resolve merge conflicts and other issues.
+
+### Your PR is merged!
+
+Congratulations :tada::tada: The DevOps team thanks you :sparkles:.
+
+Once your PR is merged, your contributions will be visible on the [TCET Linux](https://github.com/tcet-opensource/tcet-linux).
+
+Now that you are part of the TCET-Opensource community, see how else you can [contribute to the TCET-Opensource](https://opensource.tcetmumbai.in/docs/resources/workflows/external-workflow).
diff --git a/packages.x86_64 b/packages.x86_64
@@ -140,11 +140,9 @@ virtualbox-guest-utils
 
 ## TCET Linux Desktop Env - XFCE
 xfce4
-ristretto
 thunar-archive-plugin
 thunar-media-tags-plugin
 xfburn
-xfce4-artwork
 xfce4-battery-plugin
 xfce4-clipman-plugin
 xfce4-cpufreq-plugin
@@ -205,8 +203,6 @@ os-prober
 firefox
 #tcet-linux-firefox-settings
 
-## TCET Linux Office Suite
-libreoffice-fresh
 #ttf-ms-fonts
 #ttf-roboto
 #noto-fonts
@@ -279,5 +275,17 @@ tcet-linux-set-once
 # Wallpaper
 tcet-linux-wallpaper
 
+# Mirrorlist
+tcet-linux-mirrorlist
+
+# keyring
+tcet-linux-keyring
+
 #newFont-terminal-stable
 ttc-iosevka
+
+# Aur helper
+yay
+
+#tcet-linux-keyring
+tcet-linux-keyring
diff --git a/profiledef.sh b/profiledef.sh
@@ -17,7 +17,6 @@ airootfs_image_type="squashfs"
 airootfs_image_tool_options=('-comp' 'xz' '-Xbcj' 'x86' '-b' '1M' '-Xdict-size' '1M')
 file_permissions=(
   ["/etc/shadow"]="0:0:400"
-  ["/etc/skel/set_once_xfce4.sh"]="0:0:755"
   ["/root"]="0:0:750"
   ["/root/.automated_script.sh"]="0:0:755"
   ["/usr/local/bin/choose-mirror"]="0:0:755"

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@`
`48`	`48`	`# transition-duration = overrides default value`
`49`	`49`	`#`
`50`	`50`	`[greeter]`
`51`		`-background=/usr/share/backgrounds/xfce/wallpaper5.png`
	`51`	`+background=/usr/share/backgrounds/xfce/tcet-linux/wallpaper5.png`
`52`	`52`	`#user-background=`
`53`	`53`	`theme-name=Qogir-Dark`
`54`	`54`	`icon-theme-name=tela-circle-icon`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-sudo rm -rvf work/ out/`
	`1`	`+sudo rm -rvf work/ out/ tcet-linux-keyring*`