add jre and [universe]

remove /etc/local.d/0-process_local.d.start, it is part of artix-branding-base now
switch to master branch for building
2021-07-23 17:54:32 +03:00 · 2020-07-06 11:07:12 +03:00 · 2020-05-12 11:00:22 +00:00
7 changed files with 10 additions and 32 deletions
--- a/buildISOs.sh
+++ b/buildISOs.sh
@@ -81,7 +81,7 @@ else
    git clone https://gitea.artixlinux.org/artix/iso-profiles.git
 fi

-cd $PROFILES && git checkout refactor
+cd $PROFILES && git checkout master
 echo "#################################" >>$CWD/ISO_build.log
 for profile in ${profiles[@]}; do
    for init in ${inits[@]}; do
--- a/common/root-overlay/etc/local.d/0-process_local.d.start
+++ b/common/root-overlay/etc/local.d/0-process_local.d.start
@@ -1,14 +0,0 @@
-#!/bin/sh
-# local.d execution in runit/s6
-
-init=$(ls -l /sbin/init | sed 's/.*->\ \(.*\)-init/\1/')
-
-case $init in
-    runit|s6)  	for script in /etc/local.d/*.start; do
-		    [[ $script =~ local.start ]] && continue
-		    [[ $script =~ $0 ]] && continue
-		    [[ -x $script ]] && $script
-		done
-		;;
-    *)		;;
-esac
--- a/community-gtk/Packages-Root
+++ b/community-gtk/Packages-Root
@@ -212,6 +212,7 @@ firefox-adblock-plus
 firefox-noscript
 firefox-ublock-origin
 libreoffice-fresh
+jre
 mpv
 youtube-dl
 ffmpegthumbnailer
--- a/community-qt/Packages-Root
+++ b/community-qt/Packages-Root
@@ -191,6 +191,7 @@ firefox-adblock-plus
 firefox-noscript
 firefox-ublock-origin
 libreoffice-fresh
+jre
 mpv
 youtube-dl
 ffmpegthumbnailer
--- a/community/live-overlay/etc/local.d/0-process_local.d.start
+++ b/community/live-overlay/etc/local.d/0-process_local.d.start
@@ -1,14 +0,0 @@
-#!/bin/sh
-# local.d execution in runit/s6
-
-init=$(ls -l /sbin/init | sed 's/.*->\ \(.*\)-init/\1/')
-
-case $init in
-    runit|s6)  	for script in /etc/local.d/*.start; do
-		    [[ $script =~ local.start ]] && continue
-		    [[ $script =~ $0 ]] && continue
-		    [[ -x $script ]] && $script
-		done
-		;;
-    *)		;;
-esac
--- a/community/live-overlay/etc/pacman.conf
+++ b/community/live-overlay/etc/pacman.conf
@@ -95,11 +95,16 @@ Include = /etc/pacman.d/mirrorlist
 [lib32]
 Include = /etc/pacman.d/mirrorlist

+# [universe] contains packages not in mainstream Artix or Arch repos,
+# maintained by individual Artix devs
+[universe]
+Server = https://universe.artixlinux.org/$arch
+
 # An example of a custom package repository.  See the pacman manpage for
 # tips on creating your own repositories.
-#[custom]
+#[localrepo]
 #SigLevel = Optional TrustAll
-#Server = file:///home/custompkgs
+#Server = file:///home/user/localrepo

 #
 # ARCHLINUX
--- a/community/root-overlay/etc/local.d/0-process_local.d.start
+++ b/community/root-overlay/etc/local.d/0-process_local.d.start
@@ -1 +0,0 @@
-../../../live-overlay/etc/local.d/0-process_local.d.start
Author	SHA1	Message	Date
nous	c0f9920e41	add jre and [universe]	2021-07-23 17:54:32 +03:00
nous	abaa5b5d94	remove /etc/local.d/0-process_local.d.start, it is part of artix-branding-base now	2020-07-06 11:07:12 +03:00
nous	c9504ff711	switch to master branch for building	2020-05-12 11:00:22 +00:00
				`@@ -1 +0,0 @@`
				`../../../live-overlay/etc/local.d/0-process_local.d.start`