X-Git-Url: https://git.xandkar.net/?a=blobdiff_plain;f=Makefile;h=31d0fdfb9ef3e4e78afef582103d43c09a8662c1;hb=649af0dd124f870ac5abdfd31abb89d20795c0e0;hp=9140664debd1330f4ab113e020c083aeff4d8633;hpb=3dd21187c88f59e05792cbc73a5ff0e3dfa4a59b;p=khome.git

diff --git a/Makefile b/Makefile
index 9140664..31d0fdf 100644
--- a/Makefile
+++ b/Makefile
@@ -1,32 +1,37 @@
 MAKEFLAGS := --no-builtin-rules
 
-DPKG_SELECTIONS := system/debian/dpkg-selections
-APT_SOURCES     := system/debian/apt-sources.list
+.PHONY: home pkgs_deb_install pkgs_deb_purge pkgs deps
 
-.PHONY: update install install_packages
-
-install:
-	@cp  -Rp  home/bin          $(HOME)/
-	@cp  -Rp  home/lib          $(HOME)/
+home:
+	@cp  -Rp  home/bin           $(HOME)/
+	@cp  -Rp  home/lib           $(HOME)/
 	@cp       home/.compton.conf $(HOME)/
-	@cp  -Rp  home/.config/     $(HOME)/
-	@cp       home/.profile     $(HOME)/
-	@cp       home/.fonts.conf  $(HOME)/
-	@fc-cache                   $(HOME)/.fonts
-	@cp       home/.Rprofile    $(HOME)/
-	@cp       home/.mpdconf     $(HOME)/
-	@cp       home/.tmux.conf   $(HOME)/
-	@cp       home/.xbindkeysrc $(HOME)/
-
-# May still need to run:
-# 1. dselect update
-# 2. interactive dselect with install,
-# 3. apt update
-# 4. apt upgrade
-install_packages: $(DPKG_SELECTIONS)
-	@dpkg --set-selections < $<
-	@apt-get -u dselect-upgrade
-
-update:
-	@dpkg --get-selections > $(DPKG_SELECTIONS)
-	@cp /etc/apt/sources.list $(APT_SOURCES)
+	@cp  -Rp  home/.config/      $(HOME)/
+	@cp       home/.profile      $(HOME)/
+	@cp       home/.fonts.conf   $(HOME)/
+	@fc-cache                    $(HOME)/.fonts
+	@cp       home/.Rprofile     $(HOME)/
+	@cp       home/.mpdconf      $(HOME)/
+	@cp       home/.tmux.conf    $(HOME)/
+	@cp       home/.xbindkeysrc  $(HOME)/
+
+pkgs:
+	$(MAKE) pkgs_deb_install
+	$(MAKE) pkgs_deb_purge
+	$(MAKE) pkgs_snap_classic
+
+pkgs_deb_install: list pkgs-deb-install.list
+	sudo apt install $(shell ./list pkgs-deb-install.list)
+
+pkgs_deb_purge: list pkgs-deb-purge.list
+	sudo apt purge $(shell ./list pkgs-deb-purge.list)
+
+pkgs_snap_classic: list pkgs-snap-classic.list
+	@$(MAKE) $(foreach p,$(shell ./list pkgs-snap-classic.list),pkg_snap_classic_$(p))
+
+# Depends on 'snapd' deb pkg being already installed
+pkg_snap_classic_%:
+	sudo snap install --classic $*
+
+deps:
+	@$(foreach d,$(wildcard deps/*),cd $(d) && make)