From 52d1bfef64461b7bebeac5a8f26b566acc9b4193 Mon Sep 17 00:00:00 2001 From: Michael Mayer Date: Fri, 22 Apr 2022 18:46:16 +0200 Subject: [PATCH] Makefile: Abort installation if directory already exists --- Makefile | 2 +- internal/config/config_customize.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index a7ac657d2..0c677c650 100644 --- a/Makefile +++ b/Makefile @@ -80,7 +80,7 @@ tar.gz: find "$(BUILD_PATH)" -maxdepth 1 -mindepth 1 -type d -exec tar --exclude='.[^/]*' -C {} -czf {}.tar.gz . \; install: $(info Installing in "$(DESTDIR)"...) - [ ! -d "$(DESTDIR)" ] || rm -rf --preserve-root $(DESTDIR) + @[ ! -d "$(DESTDIR)" ] || (echo "ERROR: Install path '$(DESTDIR)' already exists!"; exit 1) mkdir --mode=$(INSTALL_MODE) -p $(DESTDIR) env TMPDIR="$(BUILD_PATH)" ./scripts/dist/install-tensorflow.sh $(DESTDIR) rm -rf --preserve-root $(DESTDIR)/include diff --git a/internal/config/config_customize.go b/internal/config/config_customize.go index f5c12685a..d1a3f921f 100644 --- a/internal/config/config_customize.go +++ b/internal/config/config_customize.go @@ -102,7 +102,7 @@ func (c *Config) WallpaperUri() string { return "" } - c.options.WallpaperUri = "default.jpg" + c.options.WallpaperUri = "welcome.jpg" } else if !strings.Contains(c.options.WallpaperUri, ".") { c.options.WallpaperUri += fs.ExtJPEG }