X-Git-Url: https://git.xandkar.net/?a=blobdiff_plain;f=Makefile;h=19014a31670e0c82b0c6d5c3fc64cf946cdf4bb1;hb=0846dd3e9ef339b37366e10afe8df0d83c8716ac;hp=e576ff79dc25e1b362d5b433b0527124727a09f9;hpb=dee031b5392c3b1bcf0e5555c7e65e061751415e;p=khome.git

diff --git a/Makefile b/Makefile
index e576ff7..19014a3 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,8 @@ endif
     pkgs_deb_purge \
     pkgs_debian \
     pkgs_mac \
-    pkgs_pip \
+    pkgs_pip_install \
+    pkgs_pip_upgrade \
     pkgs_snap_classic \
     pkgs_snap_strict
 
@@ -37,24 +38,18 @@ default:
 	@exit 1
 
 home: mpdconf compiled
-	@cp  -Rp       bin           $(HOME)/
-	@cp  -Rp  home/bin           $(HOME)/
-	@cp  -Rp  home/lib           $(HOME)/
-	@cp       home/.compton.conf $(HOME)/
-	@cp  -Rp  home/.config/      $(HOME)/
-	@cp  -Rp  home/.newsboat/    $(HOME)/
-	@cp       home/.profile      $(HOME)/
-	@cp       home/.fonts.conf   $(HOME)/
-	@cp       home/.Rprofile     $(HOME)/
-	@cp       home/.tmux.conf    $(HOME)/
-	@cp       home/.xbindkeysrc  $(HOME)/
+	cp -Rp bin $(HOME)/
+	# Limit depth because directories are copied recursively:
+	find home -maxdepth 1 -print0 \
+	| grep -zv '^home$$' \
+	| xargs -0 -I% cp -Rp % ~
 
 mpdconf:
-	@mkdir -p ~/Archives/Audio
-	@mkdir -p ~/var/lib/mpd/playlists
-	@mkdir -p ~/var/log/mpd
-	@mkdir -p ~/var/run/mpd
-	@cp home/.mpdconf $(HOME)/
+	mkdir -p ~/Archives/Audio
+	mkdir -p ~/var/lib/mpd/playlists
+	mkdir -p ~/var/log/mpd
+	mkdir -p ~/var/run/mpd
+	cp home/.mpdconf $(HOME)/
 
 compiled:
 	mkdir -p bin
@@ -62,7 +57,7 @@ compiled:
 	mv src/clockloop bin/
 
 font_cache:
-	@fc-cache -fv
+	fc-cache -fv
 
 #
 # Golang
@@ -82,8 +77,11 @@ pkgs_ubuntu_debfiles: list pkgs-ubuntu-debfiles.list
 #
 # PIP
 #
-pkgs_pip:
-	sudo pip3 install $(shell ./list pkgs-pip.list)
+pkgs_pip_install:
+	pip3 install --user $(shell ./list pkgs-pip.list)
+
+pkgs_pip_upgrade:
+	pip3 install --user --upgrade $(shell ./list pkgs-pip.list)
 
 #
 # Rust (cargo)