Skip to content

Commit

Permalink
Fix bug in initial webdav configuration using writeimage.sh
Browse files Browse the repository at this point in the history
  • Loading branch information
avanc committed Dec 10, 2021
1 parent 6fd6d3b commit 2b1f7e9
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 9 deletions.
2 changes: 1 addition & 1 deletion board/common/overlay/etc/version
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
OS_NAME="photOS"
OS_SHORT_NAME="photOS"
OS_PREFIX="photos"
OS_VERSION="0.3.6"
OS_VERSION="0.3.7-rc2"
10 changes: 3 additions & 7 deletions package/photoframe/S79photoframe_upgrade
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,6 @@ start() {
CURRENT=$(get_folderversion)
#echo Folder Version: $CURRENT

if [ $CURRENT -eq $LATEST ]
then
echo "Up to date"
exit 0
fi


if [ $CURRENT -gt $LATEST ]
then
echo "Folder version is greater than the supported version! Something is wrong!"
Expand Down Expand Up @@ -68,6 +61,9 @@ start() {
CURRENT=$NEXT
fi

# Copy new config from boot partition
test -n "${OS_VERSION}" || source /etc/init.d/base
prepare_conf /data/photoframe/conf/webdav.conf /does/not/exist /boot/webdav.conf


}
Expand Down
2 changes: 1 addition & 1 deletion writeimage.sh
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ fi
# dav for photoframe
if [ -n "$DAV_URL" ] && [ -n "$DAV_USER" ] && [ -n "$DAV_PASSWD" ]; then
msg "setting dav configuration"
conf=$BOOT/photoframe.conf
conf=$BOOT/webdav.conf
{
echo "$DAV_URL $DAV_USER $DAV_PASSWD"
} > "$conf"
Expand Down

0 comments on commit 2b1f7e9

Please sign in to comment.