secstate/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix merge conflict

Browse Source
This commit is contained in:
Colin Powell
2020-02-06 13:39:58 -05:00
parent 8cba796cf8
commit 039d504f82
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bin/.bin/changepaper.sh
View File

@ -11,6 +11,7 @@ export XAUTHORITY=/home/powellc/.Xauthority
# Choices: astrobin,natgeo,nasa # Choices: astrobin,natgeo,nasa
BASEDIR="$HOME/var/backgrounds/astrobin/" BASEDIR="$HOME/var/backgrounds/astrobin/"
SEARX_BASEDIR="$HOME/var/backgrounds/natgeo/"
# Get daily NatGeo POTD # Get daily NatGeo POTD
python3 ~/.bin/get_natgeo_potd.py 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 if test -f "$SEARX_BG_FILE"; then
echo "Setting Searx background image" echo "Setting Searx background image"
rm $SEARX_BG_FILE rm $SEARX_BG_FILE
ln -s $BASEDIR/$date.jpg $SEARX_BG_FILE cp $SEARX_BASEDIR/$date.jpg $SEARX_BG_FILE
fi fi
# Then grab our APOD image and store it for now # Then grab our APOD image and store it for now