beenull/photoprism
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Makefile: Abort installation if directory already exists

Browse source
This commit is contained in:
Michael Mayer 2022-04-22 18:46:16 +02:00
parent 74b2b03d94
commit 52d1bfef64
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -80,7 +80,7 @@ tar.gz:
find "$(BUILD_PATH)" -maxdepth 1 -mindepth 1 -type d -exec tar --exclude='.[^/]*' -C {} -czf {}.tar.gz . \; find "$(BUILD_PATH)" -maxdepth 1 -mindepth 1 -type d -exec tar --exclude='.[^/]*' -C {} -czf {}.tar.gz . \;
install: install:
$(info Installing in "$(DESTDIR)"...) $(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) mkdir --mode=$(INSTALL_MODE) -p $(DESTDIR)
env TMPDIR="$(BUILD_PATH)" ./scripts/dist/install-tensorflow.sh $(DESTDIR) env TMPDIR="$(BUILD_PATH)" ./scripts/dist/install-tensorflow.sh $(DESTDIR)
rm -rf --preserve-root $(DESTDIR)/include rm -rf --preserve-root $(DESTDIR)/include

2
internal/config/config_customize.go
View file

@ -102,7 +102,7 @@ func (c *Config) WallpaperUri() string {
return "" return ""
} }
c.options.WallpaperUri = "default.jpg" c.options.WallpaperUri = "welcome.jpg"
} else if !strings.Contains(c.options.WallpaperUri, ".") { } else if !strings.Contains(c.options.WallpaperUri, ".") {
c.options.WallpaperUri += fs.ExtJPEG c.options.WallpaperUri += fs.ExtJPEG
} }