Fix merge conflict
This commit is contained in:
@ -11,6 +11,7 @@ export XAUTHORITY=/home/powellc/.Xauthority
|
||||
|
||||
# Choices: astrobin,natgeo,nasa
|
||||
BASEDIR="$HOME/var/backgrounds/astrobin/"
|
||||
SEARX_BASEDIR="$HOME/var/backgrounds/natgeo/"
|
||||
|
||||
# Get daily NatGeo POTD
|
||||
python3 ~/.bin/get_natgeo_potd.py
|
||||
@ -34,7 +35,7 @@ SEARX_BG_FILE=/usr/local/lib/python2.7/site-packages/searx/static/themes/courget
|
||||
if test -f "$SEARX_BG_FILE"; then
|
||||
echo "Setting Searx background image"
|
||||
rm $SEARX_BG_FILE
|
||||
ln -s $BASEDIR/$date.jpg $SEARX_BG_FILE
|
||||
cp $SEARX_BASEDIR/$date.jpg $SEARX_BG_FILE
|
||||
fi
|
||||
|
||||
# Then grab our APOD image and store it for now
|
||||
|
||||
Reference in New Issue
Block a user