From 168f25af6bd5f7c570653808bc3c6da671d0b5a3 Mon Sep 17 00:00:00 2001 From: vinay Date: Wed, 11 Oct 2023 12:39:37 +0530 Subject: [PATCH 1/9] changed-terminal-trucation --- airootfs/root/.config/starship.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airootfs/root/.config/starship.toml b/airootfs/root/.config/starship.toml index a1acda3..af0e00b 100644 --- a/airootfs/root/.config/starship.toml +++ b/airootfs/root/.config/starship.toml @@ -45,7 +45,7 @@ $time\ style = "fg:#180024 bg:#7E6B9C " format = "[ $path ]($style)" truncation_length = 3 -truncation_symbol = "…/" +truncation_symbol = "../" [directory.substitutions] "Documents" = " " From ff45526ee7fc0e4cb4dac6aec1f93f7348d3c115 Mon Sep 17 00:00:00 2001 From: Akash6222 Date: Fri, 13 Oct 2023 02:18:45 +0530 Subject: [PATCH 2/9] [ADD] buildiso script --- buildiso.sh | 24 ++++++++++++++++++++++++ cleanup.sh | 2 +- 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100755 buildiso.sh diff --git a/buildiso.sh b/buildiso.sh new file mode 100755 index 0000000..1bd57a8 --- /dev/null +++ b/buildiso.sh @@ -0,0 +1,24 @@ +echo "Downloading tcet-linux-keyring " +wget https://github.com/tcet-opensource/tcet-linux-applications/raw/main/x86_64/tcet-linux-keyring-23.10-5-x86_64.pkg.tar.zst +sudo pacman -U tcet-linux-keyring* + +echo "Installing archsio" +sudo pacman -S archiso + +echo "Building Iso" +echo "Warning don't press ctrl+c or ctrl+z when iso is building" +sudo mkarchsio -v . + +echo "Do you want to remove tcet-linux-keyring from your system" +read answer + +if [ "$answer" == "y" ] || [ "$answer" == "yes" ]; then + echo "Removing tcet-linux-keyring." + sudo pacman -R tcet-linux-keyring +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 index 3bd785c..b5c7e7a 100755 --- a/cleanup.sh +++ b/cleanup.sh @@ -1 +1 @@ -sudo rm -rvf work/ out/ +sudo rm -rvf work/ out/ tcet-linux-keyring* From eca460f5be46fcea1b914f5faa1bf4f3eac18081 Mon Sep 17 00:00:00 2001 From: Akash Dubey <101584901+Akash6222@users.noreply.github.com> Date: Fri, 13 Oct 2023 02:52:52 +0530 Subject: [PATCH 3/9] [UPD] buildiso.sh --- buildiso.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildiso.sh b/buildiso.sh index 1bd57a8..33fd17d 100755 --- a/buildiso.sh +++ b/buildiso.sh @@ -7,7 +7,7 @@ sudo pacman -S archiso echo "Building Iso" echo "Warning don't press ctrl+c or ctrl+z when iso is building" -sudo mkarchsio -v . +sudo mkarchiso -v . echo "Do you want to remove tcet-linux-keyring from your system" read answer From a2e004bc40500b468c0c491e83de61fc142cc7f7 Mon Sep 17 00:00:00 2001 From: harshau007 Date: Fri, 13 Oct 2023 20:51:44 +0530 Subject: [PATCH 4/9] [Updated] buildiso script and README.md file --- README.md | 20 ++++++++++++++++---- buildiso.sh => buildiso | 12 ++++++++---- 2 files changed, 24 insertions(+), 8 deletions(-) rename buildiso.sh => buildiso (70%) diff --git a/README.md b/README.md index 1cf12f5..7ed1035 100644 --- 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 @@ -98,11 +98,23 @@ Packages in TCET Linux is managed by package manager. ## 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)
+## How to build ISO + +### 1. Build +```bash +git clone https://github.com/tcet-opensource/tcet-linux.git +cd tcet-linux +./buildiso +``` + +### 2. ISO will appear in `work/out/` directory +
+ ## Important Links: - [TCET Linux Website](https://linux.tcetmumbai.in/) diff --git a/buildiso.sh b/buildiso similarity index 70% rename from buildiso.sh rename to buildiso index 33fd17d..a9a2930 100755 --- a/buildiso.sh +++ b/buildiso @@ -1,15 +1,19 @@ -echo "Downloading tcet-linux-keyring " +#!/bin/bash + +echo "Downloading tcet-linux-keyring" +sudo pacman -S wget --needed wget https://github.com/tcet-opensource/tcet-linux-applications/raw/main/x86_64/tcet-linux-keyring-23.10-5-x86_64.pkg.tar.zst sudo pacman -U tcet-linux-keyring* +sudo rm -rf tcet-linux-keyring* echo "Installing archsio" -sudo pacman -S archiso +sudo pacman -S archiso --needed echo "Building Iso" echo "Warning don't press ctrl+c or ctrl+z when iso is building" -sudo mkarchiso -v . +sudo mkarchiso -v -w ./work -o ./out ./ -echo "Do you want to remove tcet-linux-keyring from your system" +echo "Do you want to remove tcet-linux-keyring from your system [y/n]" read answer if [ "$answer" == "y" ] || [ "$answer" == "yes" ]; then From 0281fcd6a44154b1dde55ce191ecee4475d7bdb5 Mon Sep 17 00:00:00 2001 From: harshau007 Date: Sun, 15 Oct 2023 11:53:21 +0530 Subject: [PATCH 5/9] [Updated] README.md --- README.md | 35 ++++++++++++++++++++++++++++++++--- 1 file changed, 32 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 7ed1035..735ff42 100644 --- a/README.md +++ b/README.md @@ -105,14 +105,43 @@ Packages in TCET Linux is managed by package manager. ## How to build ISO -### 1. Build +### 1. Clone repository ```bash git clone https://github.com/tcet-opensource/tcet-linux.git +``` + +### 2. Setup Keys +```bash +# Akash Dubey (Shut in arch linux guy) +sudo pacman-key --keyserver keyserver.ubuntu.com -r 280178FA27665D44 +sudo pacman-key --lsign-key 280178FA27665D44 + +# Rishabh Jha (Neovim lober) +sudo pacman-key --keyserver keyserver.ubuntu.com -r 421FFABA41F36DA5 +sudo pacman-key --lsign-key 421FFABA41F36DA5 + +# Atharva Vartak (Technical head) +sudo pacman-key --keyserver keyserver.ubuntu.com -r 02F660CD5FA77EBB +sudo pacman-key --lsign-key 02F660CD5FA77EBB + +# Harsh Upadhyay (kya likhu?) +sudo pacman-key --keyserver keyserver.ubuntu.com -r BF4E1E687DD0A534 +sudo pacman-key --lsign-key BF4E1E687DD0A534 +``` + +### 3. Build +```bash +# Using build script +cd tcet-linux +./buildiso # Uses tcet-linux-keyring package +``` +OR +```bash cd tcet-linux -./buildiso +sudo mkarchiso -v . # Uses keyring from keyserver ``` -### 2. ISO will appear in `work/out/` directory +### 4. ISO will appear in `work/out/` directory
## Important Links: From f94ff953d56d186b8a032bde66259da8f7d3366e Mon Sep 17 00:00:00 2001 From: harshau007 Date: Sun, 15 Oct 2023 18:02:35 +0530 Subject: [PATCH 6/9] Updated buildiso script and README.md --- README.md | 41 +++++++++++++++++++++++------------------ buildiso | 35 ++++++++++++++++++++++++++++------- 2 files changed, 51 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index 735ff42..5251f4b 100644 --- a/README.md +++ b/README.md @@ -96,52 +96,57 @@ Packages in TCET Linux is managed by package manager.
-## Glimpses of TCET Linux +# Glimpses of TCET Linux ![tcet-linux-desktop](https://raw.githubusercontent.com/tcet-opensource/artwork/main/tcet-linux/tcet-linux-desktop1.png)
-## How to build ISO +# How to build ISO -### 1. Clone repository +## Install required package +```bash +sudo pacman -S archiso +``` + +## Clone repository ```bash git clone https://github.com/tcet-opensource/tcet-linux.git ``` -### 2. Setup Keys +## Build ( Using Script ) +```bash +cd tcet-linux +./buildiso +``` +OR +## Build ( Manually ) +### Setup Keys ```bash -# Akash Dubey (Shut in arch linux guy) +# Akash Dubey sudo pacman-key --keyserver keyserver.ubuntu.com -r 280178FA27665D44 sudo pacman-key --lsign-key 280178FA27665D44 -# Rishabh Jha (Neovim lober) +# Rishabh Jha sudo pacman-key --keyserver keyserver.ubuntu.com -r 421FFABA41F36DA5 sudo pacman-key --lsign-key 421FFABA41F36DA5 -# Atharva Vartak (Technical head) +# Atharva Vartak sudo pacman-key --keyserver keyserver.ubuntu.com -r 02F660CD5FA77EBB sudo pacman-key --lsign-key 02F660CD5FA77EBB -# Harsh Upadhyay (kya likhu?) +# Harsh Upadhyay sudo pacman-key --keyserver keyserver.ubuntu.com -r BF4E1E687DD0A534 sudo pacman-key --lsign-key BF4E1E687DD0A534 ``` - -### 3. Build -```bash -# Using build script -cd tcet-linux -./buildiso # Uses tcet-linux-keyring package -``` -OR +### Build ISO ```bash cd tcet-linux -sudo mkarchiso -v . # Uses keyring from keyserver +sudo mkarchiso -v . ``` -### 4. ISO will appear in `work/out/` directory +## ISO will appear in `work/out/` directory
## Important Links: diff --git a/buildiso b/buildiso index a9a2930..a89bb94 100755 --- a/buildiso +++ b/buildiso @@ -1,14 +1,25 @@ #!/bin/bash -echo "Downloading tcet-linux-keyring" -sudo pacman -S wget --needed -wget https://github.com/tcet-opensource/tcet-linux-applications/raw/main/x86_64/tcet-linux-keyring-23.10-5-x86_64.pkg.tar.zst -sudo pacman -U tcet-linux-keyring* -sudo rm -rf tcet-linux-keyring* - echo "Installing archsio" sudo pacman -S archiso --needed +echo "Setting up Keyring" +# Akash Dubey (Shut in arch linux guy) +sudo pacman-key --keyserver keyserver.ubuntu.com -r 280178FA27665D44 +sudo pacman-key --lsign-key 280178FA27665D44 + +# Rishabh Jha (Neovim lober) +sudo pacman-key --keyserver keyserver.ubuntu.com -r 421FFABA41F36DA5 +sudo pacman-key --lsign-key 421FFABA41F36DA5 + +# Atharva Vartak (Technical head) +sudo pacman-key --keyserver keyserver.ubuntu.com -r 02F660CD5FA77EBB +sudo pacman-key --lsign-key 02F660CD5FA77EBB + +# Harsh Upadhyay (kya likhu?) +sudo pacman-key --keyserver keyserver.ubuntu.com -r BF4E1E687DD0A534 +sudo pacman-key --lsign-key BF4E1E687DD0A534 + echo "Building Iso" echo "Warning don't press ctrl+c or ctrl+z when iso is building" sudo mkarchiso -v -w ./work -o ./out ./ @@ -18,7 +29,17 @@ read answer if [ "$answer" == "y" ] || [ "$answer" == "yes" ]; then echo "Removing tcet-linux-keyring." - sudo pacman -R tcet-linux-keyring + # Akash Dubey (Shut in arch linux guy) + sudo pacman-key --delete 280178FA27665D44 + + # Rishabh Jha (Neovim lober) + sudo pacman-key --delete 421FFABA41F36DA5 + + # Atharva Vartak (Technical head) + sudo pacman-key --delete 02F660CD5FA77EBB + + # Harsh Upadhyay (kya likhu?) + sudo pacman-key --delete BF4E1E687DD0A534 elif [ "$answer" == "n" ] || [ "$answer" == "no" ]; then echo "tcet-linux-keyring present in your system." exit 0 From 29d9594e023b8c4de5903317bbe6c80dd54b4e93 Mon Sep 17 00:00:00 2001 From: Harsh Upadhyay <49197635+harshau007@users.noreply.github.com> Date: Sun, 15 Oct 2023 21:57:19 +0530 Subject: [PATCH 7/9] Update README.md --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 5251f4b..bfe885b 100644 --- a/README.md +++ b/README.md @@ -124,19 +124,19 @@ OR ## Build ( Manually ) ### Setup Keys ```bash -# Akash Dubey +# https://github.com/Akash6222 sudo pacman-key --keyserver keyserver.ubuntu.com -r 280178FA27665D44 sudo pacman-key --lsign-key 280178FA27665D44 -# Rishabh Jha +# https://github.com/Rishabh672003 sudo pacman-key --keyserver keyserver.ubuntu.com -r 421FFABA41F36DA5 sudo pacman-key --lsign-key 421FFABA41F36DA5 -# Atharva Vartak +# https://github.com/0xAtharv sudo pacman-key --keyserver keyserver.ubuntu.com -r 02F660CD5FA77EBB sudo pacman-key --lsign-key 02F660CD5FA77EBB -# Harsh Upadhyay +# https://github.com/harshau007 sudo pacman-key --keyserver keyserver.ubuntu.com -r BF4E1E687DD0A534 sudo pacman-key --lsign-key BF4E1E687DD0A534 ``` From c0b672c264ea87776cc1a71d4a8a9f8e8f3668b8 Mon Sep 17 00:00:00 2001 From: Harsh Upadhyay <49197635+harshau007@users.noreply.github.com> Date: Sun, 15 Oct 2023 21:59:43 +0530 Subject: [PATCH 8/9] [UPDATED] New workflow for release --- .github/workflows/iso-build.yml | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/.github/workflows/iso-build.yml b/.github/workflows/iso-build.yml index b7c6673..31fd335 100644 --- 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 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 }} - From b3aafc3b32d6ba82e16537917c19a290b7a8d753 Mon Sep 17 00:00:00 2001 From: Akash6222 Date: Mon, 16 Oct 2023 01:13:49 +0530 Subject: [PATCH 9/9] [UPD] Readme and buildiso --- README.md | 9 +++++---- buildiso | 16 ++++++++-------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index bfe885b..72c1d9a 100644 --- a/README.md +++ b/README.md @@ -124,21 +124,22 @@ OR ## Build ( Manually ) ### Setup Keys ```bash -# https://github.com/Akash6222 +# Akash6222 sudo pacman-key --keyserver keyserver.ubuntu.com -r 280178FA27665D44 sudo pacman-key --lsign-key 280178FA27665D44 -# https://github.com/Rishabh672003 +# Rishabh672003 sudo pacman-key --keyserver keyserver.ubuntu.com -r 421FFABA41F36DA5 sudo pacman-key --lsign-key 421FFABA41F36DA5 -# https://github.com/0xAtharv +# 0xAtharv sudo pacman-key --keyserver keyserver.ubuntu.com -r 02F660CD5FA77EBB sudo pacman-key --lsign-key 02F660CD5FA77EBB -# https://github.com/harshau007 +# harshau007 sudo pacman-key --keyserver keyserver.ubuntu.com -r BF4E1E687DD0A534 sudo pacman-key --lsign-key BF4E1E687DD0A534 + ``` ### Build ISO ```bash diff --git a/buildiso b/buildiso index a89bb94..6d6885c 100755 --- a/buildiso +++ b/buildiso @@ -4,19 +4,19 @@ echo "Installing archsio" sudo pacman -S archiso --needed echo "Setting up Keyring" -# Akash Dubey (Shut in arch linux guy) +# Akash6222 sudo pacman-key --keyserver keyserver.ubuntu.com -r 280178FA27665D44 sudo pacman-key --lsign-key 280178FA27665D44 -# Rishabh Jha (Neovim lober) +# Rishabh672003 sudo pacman-key --keyserver keyserver.ubuntu.com -r 421FFABA41F36DA5 sudo pacman-key --lsign-key 421FFABA41F36DA5 -# Atharva Vartak (Technical head) +# 0xAtharv sudo pacman-key --keyserver keyserver.ubuntu.com -r 02F660CD5FA77EBB sudo pacman-key --lsign-key 02F660CD5FA77EBB -# Harsh Upadhyay (kya likhu?) +# harshau007 sudo pacman-key --keyserver keyserver.ubuntu.com -r BF4E1E687DD0A534 sudo pacman-key --lsign-key BF4E1E687DD0A534 @@ -29,16 +29,16 @@ read answer if [ "$answer" == "y" ] || [ "$answer" == "yes" ]; then echo "Removing tcet-linux-keyring." - # Akash Dubey (Shut in arch linux guy) + # Akash6222 sudo pacman-key --delete 280178FA27665D44 - # Rishabh Jha (Neovim lober) + # Rishabh672003 sudo pacman-key --delete 421FFABA41F36DA5 - # Atharva Vartak (Technical head) + # 0xAtharv sudo pacman-key --delete 02F660CD5FA77EBB - # Harsh Upadhyay (kya likhu?) + # harshau007 sudo pacman-key --delete BF4E1E687DD0A534 elif [ "$answer" == "n" ] || [ "$answer" == "no" ]; then echo "tcet-linux-keyring present in your system."