fix konversation typo

Makefile

@@ -33,8 +33,8 @@ RC = \
 	data/rc/pacman-init \
 	data/rc/artix-live
 
-RUNIT_CORE = \
+RUNIT_SVD = \
-	data/runit/89-artix-live.sh
+	data/runit/live
 
 RUNIT_SV = \
 	data/runit/pacman-init.run
@@ -45,9 +45,13 @@ GRUB_DEFAULT = \
 GRUB_D = \
 	data/99_zzz-portable-efi
 
+XDG = $(wildcard data/*.desktop)
+
+XBIN = bin/desktop-items
+
 all: $(BIN) $(RC) $(RUNIT_SV) $(XBIN) $(GRUB_D)
 
-EDIT = sed -e "s|@datadir[@]|$(DATADIR)$(TOOLS)|g" \
+EDIT = sed -e "s|@datadir[@]|$(DATADIR)/$(TOOLS)|g" \
 	-e "s|@sysconfdir[@]|$(SYSCONFDIR)/$(TOOLS)|g" \
 	-e "s|@libdir[@]|$(LIBDIR)/$(TOOLS)|g"
 
@@ -68,17 +72,21 @@ install_base:
 	install $(DMODE) $(DESTDIR)$(LIBDIR)/$(TOOLS)
 	install $(FMODE) $(LIBS) $(DESTDIR)$(LIBDIR)/$(TOOLS)
 
-	install $(DMODE) $(DESTDIR)$(DATADIR)$(TOOLS)
+	install $(DMODE) $(DESTDIR)$(DATADIR)/$(TOOLS)
-	install $(FMODE) $(SHARED) $(DESTDIR)$(DATADIR)$(TOOLS)
+	install $(FMODE) $(SHARED) $(DESTDIR)$(DATADIR)/$(TOOLS)
 
 install_rc:
 	install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/init.d
 	install $(BMODE) $(RC) $(DESTDIR)$(SYSCONFDIR)/init.d
 
 install_runit:
-	install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/runit/core-services
+	install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/rc/sysinit
+	install $(DMODE) $(DESTDIR)$(LIBDIR)/rc/sv.d
+
 	install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/runit/sv/pacman-init
-	install $(BMODE) $(RUNIT_CORE) $(DESTDIR)$(SYSCONFDIR)/runit/core-services
+	install $(BMODE) $(RUNIT_SVD) $(DESTDIR)$(LIBDIR)/rc/sv.d
+	ln -sf $(LIBDIR)/rc/sv.d/live $(DESTDIR)$(SYSCONFDIR)/rc/sysinit/98-live
+
 	install $(BMODE) $(RUNIT_SV) $(DESTDIR)$(SYSCONFDIR)/runit/sv/pacman-init/run
 
 install_portable_efi:
@@ -88,27 +96,13 @@ install_portable_efi:
 	install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/grub.d
 	install $(BMODE) $(GRUB_D) $(DESTDIR)$(SYSCONFDIR)/grub.d
 
-uninstall_base:
+install_xdg:
-	for f in $(notdir $(BIN)); do $(RM) $(DESTDIR)$(PREFIX)/bin/$$f; done
+	install -dm0755 $(DESTDIR)$(PREFIX)/bin
-	for f in $(notdir $(SHARED)); do $(RM) $(DESTDIR)$(DATADIR)$(TOOLS)/$$f; done
+	install -m0755 ${XBIN} $(DESTDIR)$(PREFIX)/bin
-	for f in $(notdir $(LIBS)); do $(RM) $(DESTDIR)$(LIBDIR)/$(TOOLS)/$$f; done
 
-uninstall_portable_efi:
+	install -dm0755 $(DESTDIR)$(SYSCONFDIR)/skel/.config/autostart
-	for f in $(notdir $(GRUB_DEFAULT)); do $(RM) $(DESTDIR)$(SYSCONFDIR)/default/$$f; done
+	install -m0755 ${XDG} $(DESTDIR)$(SYSCONFDIR)/skel/.config/autostart
-	for f in $(notdir $(GRUB_D)); do $(RM) $(DESTDIR)$(SYSCONFDIR)/grub.d/$$f; done
 
-uninstall_rc:
+install: install_base install_rc install_portable_efi install_xdg
-	for f in $(notdir $(RC)); do $(RM) $(DESTDIR)$(SYSCONFDIR)/init.d/$$f; done
-
-uninstall_runit:
-	for f in $(notdir $(RUNIT_SV)); do $(RM) $(DESTDIR)$(SYSCONFDIR)/runit/sv/$$f; done
-
-install: install_base install_rc install_portable_efi
-
-uninstall: uninstall_base uninstall_rc uninstall_runit uninstall_portable_efi
-
-dist:
-	git archive --format=tar --prefix=$(PKG)-$(VERSION)/ $(VERSION) | gzip -9 > $(PKG)-$(VERSION).tar.gz
-	gpg --detach-sign --use-agent $(PKG)-$(VERSION).tar.gz
 
 .PHONY: all clean install uninstall dist

bin/artix-live.in

@@ -37,14 +37,6 @@ livetimer=$(get_timer_ms)
 configure_user
 echo "Created user ${username} with password ${password}: $(elapsed_time_ms ${livetimer})ms" >> "${LOGFILE}"
 
-livetimer=$(get_timer_ms)
-configure_sudoers_d
-echo "Configured sudoers: $(elapsed_time_ms ${livetimer})ms" >> "${LOGFILE}"
-
-# livetimer=$(get_timer_ms)
-# configure_machine_id
-# echo "Configured machine-id: $(elapsed_time_ms ${livetimer})ms" >> "${LOGFILE}"
-
 livetimer=$(get_timer_ms)
 configure_accountsservice "${username}"
 echo "Configured accountsservice: $(elapsed_time_ms ${livetimer})ms" >> "${LOGFILE}"
@@ -53,10 +45,6 @@ livetimer=$(get_timer_ms)
 configure_displaymanager
 echo "Configured displaymanager: $(elapsed_time_ms ${livetimer})ms" >> "${LOGFILE}"
 
-livetimer=$(get_timer_ms)
-configure_calamares
-echo "Configured calamares netinstall ${netinstall} $(elapsed_time_ms ${livetimer})ms" >> "${LOGFILE}"
-
 livetimer=$(get_timer_ms)
 configure_user_root /
 echo "Configured root user: $(elapsed_time_ms ${livetimer})ms" >> "${LOGFILE}"

bin/desktop-items.in

@@ -0,0 +1,26 @@
+#!/bin/sh
+
+xdg=$(xdg-user-dir DESKTOP)
+src=/usr/share/applications
+
+if [[ -f $src/Konversation.desktop ]]; then
+    install -Dm755 $src/Konversation.desktop \
+    $xdg/Konversation-artix-help.desktop
+fi
+
+if [[ -f /usr/bin/calamares ]]; then
+    install -Dm755 $src/calamares.desktop \
+    $xdg/calamares.desktop
+fi
+
+docs=/usr/share/doc/artix
+
+for f in {Configuration,Installation,Migration,Troubleshooting}.pdf;do
+    ln -s $docs/$f $xdg/$f
+done
+
+if [[ -d /run/openrc ]];then
+    ln -s $docs/OpenRC.pdf $xdg/OpenRC.pdf
+else
+    ln -s $docs/Runit.pdf $xdg/Runit.pdf
+fi

data/runit/89-artix-live.sh

@@ -1,2 +0,0 @@
-msg "Initializing artix-live script"
-artix-live

data/runit/live

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+. /usr/lib/rc/functions
+
+case "$1" in
+    start)
+        stat_busy "Initializing artix live system"
+        artix-live #|| stat_die
+        add_daemon live
+        stat_done
+        ;;
+    *)
+        echo "usage: $0 {start}"
+        ;;
+esac

lib/util-live.sh

@@ -267,23 +267,6 @@ configure_language(){
     echo "Configured timezone: ${timezone}" >> "${LOGFILE}"
 }
 
-configure_calamares(){
-    if [[ -f /usr/bin/calamares ]];then
-        netinstall=$(get_cal_mode)
-        if [[ "${netinstall}" == 'no' ]];then
-            sed -e "/- netinstall/d" \
-                -e "s|- chrootcfg|- unpackfs|" -i /etc/calamares/settings.conf
-
-            sed -e '$ d' -i /etc/calamares/modules/welcome.conf
-        fi
-    fi
-}
-
-configure_sudoers_d(){
-    echo "%wheel  ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/g_wheel
-    echo "root ALL=(ALL) ALL"  > /etc/sudoers.d/u_root
-}
-
 configure_swap(){
     local swapdev="$(fdisk -l 2>/dev/null | grep swap | cut -d' ' -f1)"
     if [ -e "${swapdev}" ]; then