Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Issue #148 Check openHAB version and perform an upgrade if different #149

Merged
merged 16 commits into from Jan 10, 2018
Merged

Issue #148 Check openHAB version and perform an upgrade if different #149

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
cdd9aab
Implemented a check against the openHAB version and perform an upgrad…
rkoshak Dec 28, 2017
811b983
Cleaned up problems found by Codacy, ran upgrade.sh
rkoshak Dec 28, 2017
f423134
Copied the original .sh files from master on the openhab-docker repo …
rkoshak Dec 28, 2017
1db013e
Suggested updates made:
rkoshak Jan 3, 2018
74c4a07
Fixed indentation and double quotes around some of the directories, …
rkoshak Jan 4, 2018
c824c98
Fixed error thrown in attempt to use --exclude in the tar command. Wh…
rkoshak Jan 4, 2018
e020354
This version should work for -X. We have to be careful though, not al…
rkoshak Jan 4, 2018
e04db6e
Fixed typo in check against curVersion and imgVersion
rkoshak Jan 4, 2018
fb3e8ea
Moved the test for the existance of the backup folder and creation of…
rkoshak Jan 5, 2018
aed3cc6
Reordered the files copied over from userdata.dist alphabetically, ad…
rkoshak Jan 6, 2018
f57ecac
Added overrides.properties to the list of files copied over from user…
rkoshak Jan 6, 2018
c30a1f9
Fixes and improvements
wborn Jan 6, 2018
6184ed6
Merge pull request #1 from wborn/upgrade
rkoshak Jan 6, 2018
63dc879
Changed the test to see if version.properties is different between im…
rkoshak Jan 6, 2018
07a9607
Forgot to run upgrade.sh
rkoshak Jan 6, 2018
fc27cf8
Fixing echo that referred to previously removed variables. Not sure h…
rkoshak Jan 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
37 changes: 37 additions & 0 deletions 1.8.3/amd64/alpine/entrypoint.sh
View file
Open in desktop
Expand Up @@ -37,6 +37,43 @@ case ${OPENHAB_VERSION} in
cp -av "${APPDIR}/userdata.dist/." "${APPDIR}/userdata/"
fi

# Upgrade userdata if versions do not match
curVersion=$(< ${APPDIR}/userdata/etc/version.properties grep build-no | cut -d : -f 2 | tr -d '[:space]')
imgVersion=$(< ${APPDIR}/userdata.dist/etc/version.properties grep build-no | cut -d : -f 2 | tr -d '[:space]')
echo "Current \"${curVersion}\" Image \"${imgVersion}\"" # TODO remove
if [ "${curVersion}" != "${imgVersion}" ]; then
echo "Image version \"${imgVersion}\" is different from userdata version \"${curVersion}\""

# Make a backup of userdata
backupFile=userdata-$(date +"%FT%H:%M:%S").tar
tar cf /tmp/${backupFile} ${APPDIR}/userdata
if [ ! -d "${APPDIR}/userdata/backup" ]; then
mkdir ${APPDIR}/userdata/backup
fi
cp /tmp/${backupFile} ${APPDIR}/userdata/backup/
echo "You can find backup of userdata in ${APPDIR}/userdata/backup/${backupFile}"

# Copy over the updated files
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we really want to also be managing this list here? Would it be better to call the backup and update scripts instead?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The update script will download the zip file each time. Would it be better to include the list of files in the distribution for a package manager (and the backup/restore scripts) to use?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes that would be great :-)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, I don't really but it was a bigger job across two repos to pull them out into a list that can be used in both places. This list doesn't change that frequently so I figured we would kick the can down the road just a bit until we can figure out how to make the list usable for both.

My initial thoughts were perhaps that part of the script could be pulled out into a separate script that both entrypoint and all the installation and upgrade scripts call. Then not only would the list be reusable here but the actual behavior. That would guarantee that Docker would keep up with changes to the upgrade process in the future. I don't know if the apt/yum installers can support that though.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For me it would be okay as a first step.

Btw: I think that @BClark09 did not mean it as an improvement on this PR but the openHAB-generic side of things.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep that's right, I agree what you're doing is good for now but when I have the time (may be a few weeks), I'll add the proposed list to openhab-distro, and make subsequent PRs for openhab-docker and openhab-linuxpkg. :)

cp ${APPDIR}/userdata.dist/etc/all.policy ${APPDIR}/userdata/etc/
cp ${APPDIR}/userdata.dist/etc/branding.properties ${APPDIR}/userdata/etc/
cp ${APPDIR}/userdata.dist/etc/branding-ssh.properties ${APPDIR}/userdata/etc/
cp ${APPDIR}/userdata.dist/etc/config.properties ${APPDIR}/userdata/etc/
cp ${APPDIR}/userdata.dist/etc/custom.properties ${APPDIR}/userdata/etc/
cp ${APPDIR}/userdata.dist/etc/version.properties ${APPDIR}/userdata/etc/
cp ${APPDIR}/userdata.dist/etc/distribution.info ${APPDIR}/userdata/etc/
cp ${APPDIR}/userdata.dist/etc/jre.properties ${APPDIR}/userdata/etc/
cp ${APPDIR}/userdata.dist/etc/profile.cfg ${APPDIR}/userdata/etc/
cp ${APPDIR}/userdata.dist/etc/startup.properties ${APPDIR}/userdata/etc
cp ${APPDIR}/userdata.dist/etc/org.apache.karaf* ${APPDIR}/userdata/etc/
cp ${APPDIR}/userdata.dist/etc/org.ops4j.pax.url.mvn.cfg ${APPDIR}/userdata/etc/
echo "Replaced files in userdata/etc with newer versions"

# Clear the cache and tmp
rm -rf ${APPDIR}/userdata/cache/*
rm -rf ${APPDIR}/userdata/tmp/*
echo "Cleared the cache and tmp"
fi

if [ -z "$(ls -A "${APPDIR}/conf")" ]; then
# Copy userdata dir for version 2.0.0
echo "No configuration found... initializing."
Expand Down
41 changes: 39 additions & 2 deletions 1.8.3/amd64/debian/entrypoint.sh
View file
Open in desktop
Expand Up @@ -46,20 +46,57 @@ fi
# Copy initial files to host volume
case ${OPENHAB_VERSION} in
1.8.3)
if [ -z "$(ls -A "${APPDIR}/configurations")" ]; then
if [ -z a"$(ls -A "${APPDIR}/configurations")" ]; then
# Copy userdata dir for version 1.8.3
echo "No configuration found... initializing."
cp -av "${APPDIR}/configurations.dist/." "${APPDIR}/configurations/"
fi
;;
2.0.0|2.1.0|2.2.0|2.3.0-snapshot)
# Initialize empty host volumes
if [ -z "$(ls -A "${APPDIR}/userdata")" ]; then
if [ -za"$(ls -A "${APPDIR}/userdata")" ]; then
# Copy userdata dir for version 2.0.0
echo "No userdata found... initializing."
cp -av "${APPDIR}/userdata.dist/." "${APPDIR}/userdata/"
fi

# Upgrade userdata if versions do not match
curVersion=$(< ${APPDIR}/userdata/etc/version.properties grep build-no | cut -d : -f 2 | tr -d '[:space]')
imgVersion=$(< ${APPDIR}/userdata.dist/etc/version.properties grep build-no | cut -d : -f 2 | tr -d '[:space]')
echo "Current \"${curVersion}\" Image \"${imgVersion}\"" # TODO remove
if [ "${curVersion}" = "${imgVersion}" ]; then
echo "Image version \"${imgVersion}\" is different from userdata version \"${curVersion}\""

# Make a backup of userdata
backupFile=userdata-$(date +"%FT%H:%M:%S").tar
tar cf /tmp/${backupFile} ${APPDIR}/userdata
if [ ! -d "${APPDIR}/userdata/backup" ]; then
mkdir ${APPDIR}/userdata/backup
fi
cp /tmp/${backupFile} ${APPDIR}/userdata/backup/
echo "You can find backup of userdata in ${APPDIR}/userdata/backup/${backupFile}"

# Copy over the updated files
cp ${APPDIR}/userdata.dist/etc/all.policy ${APPDIR}/userdata/etc/
cp ${APPDIR}/userdata.dist/etc/branding.properties ${APPDIR}/userdata/etc/
cp ${APPDIR}/userdata.dist/etc/branding-ssh.properties ${APPDIR}/userdata/etc/
cp ${APPDIR}/userdata.dist/etc/config.properties ${APPDIR}/userdata/etc/
cp ${APPDIR}/userdata.dist/etc/custom.properties ${APPDIR}/userdata/etc/
cp ${APPDIR}/userdata.dist/etc/version.properties ${APPDIR}/userdata/etc/
cp ${APPDIR}/userdata.dist/etc/distribution.info ${APPDIR}/userdata/etc/
cp ${APPDIR}/userdata.dist/etc/jre.properties ${APPDIR}/userdata/etc/
cp ${APPDIR}/userdata.dist/etc/profile.cfg ${APPDIR}/userdata/etc/
cp ${APPDIR}/userdata.dist/etc/startup.properties ${APPDIR}/userdata/etc
cp ${APPDIR}/userdata.dist/etc/org.apache.karaf* ${APPDIR}/userdata/etc/
cp ${APPDIR}/userdata.dist/etc/org.ops4j.pax.url.mvn.cfg ${APPDIR}/userdata/etc/
echo "Replaced files in userdata/etc with newer versions"

# Clear the cache and tmp
rm -rf ${APPDIR}/userdata/cache/*
rm -rf ${APPDIR}/userdata/tmp/*
echo "Cleared the cache and tmp"
fi

if [ -z "$(ls -A "${APPDIR}/conf")" ]; then
# Copy userdata dir for version 2.0.0
echo "No configuration found... initializing."
Expand Down
37 changes: 37 additions & 0 deletions 1.8.3/arm64/alpine/entrypoint.sh
View file
Open in desktop
Expand Up @@ -37,6 +37,43 @@ case ${OPENHAB_VERSION} in
cp -av "${APPDIR}/userdata.dist/." "${APPDIR}/userdata/"
fi

# Upgrade userdata if versions do not match
curVersion=$(< ${APPDIR}/userdata/etc/version.properties grep build-no | cut -d : -f 2 | tr -d '[:space]')
imgVersion=$(< ${APPDIR}/userdata.dist/etc/version.properties grep build-no | cut -d : -f 2 | tr -d '[:space]')
echo "Current \"${curVersion}\" Image \"${imgVersion}\"" # TODO remove
if [ "${curVersion}" != "${imgVersion}" ]; then
echo "Image version \"${imgVersion}\" is different from userdata version \"${curVersion}\""

# Make a backup of userdata
backupFile=userdata-$(date +"%FT%H:%M:%S").tar
tar cf /tmp/${backupFile} ${APPDIR}/userdata
if [ ! -d "${APPDIR}/userdata/backup" ]; then
mkdir ${APPDIR}/userdata/backup
fi
cp /tmp/${backupFile} ${APPDIR}/userdata/backup/
echo "You can find backup of userdata in ${APPDIR}/userdata/backup/${backupFile}"

# Copy over the updated files
cp ${APPDIR}/userdata.dist/etc/all.policy ${APPDIR}/userdata/etc/
cp ${APPDIR}/userdata.dist/etc/branding.properties ${APPDIR}/userdata/etc/
cp ${APPDIR}/userdata.dist/etc/branding-ssh.properties ${APPDIR}/userdata/etc/
cp ${APPDIR}/userdata.dist/etc/config.properties ${APPDIR}/userdata/etc/
cp ${APPDIR}/userdata.dist/etc/custom.properties ${APPDIR}/userdata/etc/
cp ${APPDIR}/userdata.dist/etc/version.properties ${APPDIR}/userdata/etc/
cp ${APPDIR}/userdata.dist/etc/distribution.info ${APPDIR}/userdata/etc/
cp ${APPDIR}/userdata.dist/etc/jre.properties ${APPDIR}/userdata/etc/
cp ${APPDIR}/userdata.dist/etc/profile.cfg ${APPDIR}/userdata/etc/
cp ${APPDIR}/userdata.dist/etc/startup.properties ${APPDIR}/userdata/etc
cp ${APPDIR}/userdata.dist/etc/org.apache.karaf* ${APPDIR}/userdata/etc/
cp ${APPDIR}/userdata.dist/etc/org.ops4j.pax.url.mvn.cfg ${APPDIR}/userdata/etc/
echo "Replaced files in userdata/etc with newer versions"

# Clear the cache and tmp
rm -rf ${APPDIR}/userdata/cache/*
rm -rf ${APPDIR}/userdata/tmp/*
echo "Cleared the cache and tmp"
fi

if [ -z "$(ls -A "${APPDIR}/conf")" ]; then
# Copy userdata dir for version 2.0.0
echo "No configuration found... initializing."
Expand Down
41 changes: 39 additions & 2 deletions 1.8.3/arm64/debian/entrypoint.sh
View file
Open in desktop
Expand Up @@ -46,20 +46,57 @@ fi
# Copy initial files to host volume
case ${OPENHAB_VERSION} in
1.8.3)
if [ -z "$(ls -A "${APPDIR}/configurations")" ]; then
if [ -z a"$(ls -A "${APPDIR}/configurations")" ]; then
# Copy userdata dir for version 1.8.3
echo "No configuration found... initializing."
cp -av "${APPDIR}/configurations.dist/." "${APPDIR}/configurations/"
fi
;;
2.0.0|2.1.0|2.2.0|2.3.0-snapshot)
# Initialize empty host volumes
if [ -z "$(ls -A "${APPDIR}/userdata")" ]; then
if [ -za"$(ls -A "${APPDIR}/userdata")" ]; then
# Copy userdata dir for version 2.0.0
echo "No userdata found... initializing."
cp -av "${APPDIR}/userdata.dist/." "${APPDIR}/userdata/"
fi

# Upgrade userdata if versions do not match
curVersion=$(< ${APPDIR}/userdata/etc/version.properties grep build-no | cut -d : -f 2 | tr -d '[:space]')
imgVersion=$(< ${APPDIR}/userdata.dist/etc/version.properties grep build-no | cut -d : -f 2 | tr -d '[:space]')
echo "Current \"${curVersion}\" Image \"${imgVersion}\"" # TODO remove
if [ "${curVersion}" = "${imgVersion}" ]; then
echo "Image version \"${imgVersion}\" is different from userdata version \"${curVersion}\""

# Make a backup of userdata
backupFile=userdata-$(date +"%FT%H:%M:%S").tar
tar cf /tmp/${backupFile} ${APPDIR}/userdata
if [ ! -d "${APPDIR}/userdata/backup" ]; then
mkdir ${APPDIR}/userdata/backup
fi
cp /tmp/${backupFile} ${APPDIR}/userdata/backup/
echo "You can find backup of userdata in ${APPDIR}/userdata/backup/${backupFile}"

# Copy over the updated files
cp ${APPDIR}/userdata.dist/etc/all.policy ${APPDIR}/userdata/etc/
cp ${APPDIR}/userdata.dist/etc/branding.properties ${APPDIR}/userdata/etc/
cp ${APPDIR}/userdata.dist/etc/branding-ssh.properties ${APPDIR}/userdata/etc/
cp ${APPDIR}/userdata.dist/etc/config.properties ${APPDIR}/userdata/etc/
cp ${APPDIR}/userdata.dist/etc/custom.properties ${APPDIR}/userdata/etc/
cp ${APPDIR}/userdata.dist/etc/version.properties ${APPDIR}/userdata/etc/
cp ${APPDIR}/userdata.dist/etc/distribution.info ${APPDIR}/userdata/etc/
cp ${APPDIR}/userdata.dist/etc/jre.properties ${APPDIR}/userdata/etc/
cp ${APPDIR}/userdata.dist/etc/profile.cfg ${APPDIR}/userdata/etc/
cp ${APPDIR}/userdata.dist/etc/startup.properties ${APPDIR}/userdata/etc
cp ${APPDIR}/userdata.dist/etc/org.apache.karaf* ${APPDIR}/userdata/etc/
cp ${APPDIR}/userdata.dist/etc/org.ops4j.pax.url.mvn.cfg ${APPDIR}/userdata/etc/
echo "Replaced files in userdata/etc with newer versions"

# Clear the cache and tmp
rm -rf ${APPDIR}/userdata/cache/*
rm -rf ${APPDIR}/userdata/tmp/*
echo "Cleared the cache and tmp"
fi

if [ -z "$(ls -A "${APPDIR}/conf")" ]; then
# Copy userdata dir for version 2.0.0
echo "No configuration found... initializing."
Expand Down
37 changes: 37 additions & 0 deletions 1.8.3/armhf/alpine/entrypoint.sh
View file
Open in desktop
Expand Up @@ -37,6 +37,43 @@ case ${OPENHAB_VERSION} in
cp -av "${APPDIR}/userdata.dist/." "${APPDIR}/userdata/"
fi

# Upgrade userdata if versions do not match
curVersion=$(< ${APPDIR}/userdata/etc/version.properties grep build-no | cut -d : -f 2 | tr -d '[:space]')
imgVersion=$(< ${APPDIR}/userdata.dist/etc/version.properties grep build-no | cut -d : -f 2 | tr -d '[:space]')
echo "Current \"${curVersion}\" Image \"${imgVersion}\"" # TODO remove
if [ "${curVersion}" != "${imgVersion}" ]; then
echo "Image version \"${imgVersion}\" is different from userdata version \"${curVersion}\""

# Make a backup of userdata
backupFile=userdata-$(date +"%FT%H:%M:%S").tar
tar cf /tmp/${backupFile} ${APPDIR}/userdata
if [ ! -d "${APPDIR}/userdata/backup" ]; then
mkdir ${APPDIR}/userdata/backup
fi
cp /tmp/${backupFile} ${APPDIR}/userdata/backup/
echo "You can find backup of userdata in ${APPDIR}/userdata/backup/${backupFile}"

# Copy over the updated files
cp ${APPDIR}/userdata.dist/etc/all.policy ${APPDIR}/userdata/etc/
cp ${APPDIR}/userdata.dist/etc/branding.properties ${APPDIR}/userdata/etc/
cp ${APPDIR}/userdata.dist/etc/branding-ssh.properties ${APPDIR}/userdata/etc/
cp ${APPDIR}/userdata.dist/etc/config.properties ${APPDIR}/userdata/etc/
cp ${APPDIR}/userdata.dist/etc/custom.properties ${APPDIR}/userdata/etc/
cp ${APPDIR}/userdata.dist/etc/version.properties ${APPDIR}/userdata/etc/
cp ${APPDIR}/userdata.dist/etc/distribution.info ${APPDIR}/userdata/etc/
cp ${APPDIR}/userdata.dist/etc/jre.properties ${APPDIR}/userdata/etc/
cp ${APPDIR}/userdata.dist/etc/profile.cfg ${APPDIR}/userdata/etc/
cp ${APPDIR}/userdata.dist/etc/startup.properties ${APPDIR}/userdata/etc
cp ${APPDIR}/userdata.dist/etc/org.apache.karaf* ${APPDIR}/userdata/etc/
cp ${APPDIR}/userdata.dist/etc/org.ops4j.pax.url.mvn.cfg ${APPDIR}/userdata/etc/
echo "Replaced files in userdata/etc with newer versions"

# Clear the cache and tmp
rm -rf ${APPDIR}/userdata/cache/*
rm -rf ${APPDIR}/userdata/tmp/*
echo "Cleared the cache and tmp"
fi

if [ -z "$(ls -A "${APPDIR}/conf")" ]; then
# Copy userdata dir for version 2.0.0
echo "No configuration found... initializing."
Expand Down
41 changes: 39 additions & 2 deletions 1.8.3/armhf/debian/entrypoint.sh
View file
Open in desktop
Expand Up @@ -46,20 +46,57 @@ fi
# Copy initial files to host volume
case ${OPENHAB_VERSION} in
1.8.3)
if [ -z "$(ls -A "${APPDIR}/configurations")" ]; then
if [ -z a"$(ls -A "${APPDIR}/configurations")" ]; then
# Copy userdata dir for version 1.8.3
echo "No configuration found... initializing."
cp -av "${APPDIR}/configurations.dist/." "${APPDIR}/configurations/"
fi
;;
2.0.0|2.1.0|2.2.0|2.3.0-snapshot)
# Initialize empty host volumes
if [ -z "$(ls -A "${APPDIR}/userdata")" ]; then
if [ -za"$(ls -A "${APPDIR}/userdata")" ]; then
# Copy userdata dir for version 2.0.0
echo "No userdata found... initializing."
cp -av "${APPDIR}/userdata.dist/." "${APPDIR}/userdata/"
fi

# Upgrade userdata if versions do not match
curVersion=$(< ${APPDIR}/userdata/etc/version.properties grep build-no | cut -d : -f 2 | tr -d '[:space]')
imgVersion=$(< ${APPDIR}/userdata.dist/etc/version.properties grep build-no | cut -d : -f 2 | tr -d '[:space]')
echo "Current \"${curVersion}\" Image \"${imgVersion}\"" # TODO remove
if [ "${curVersion}" = "${imgVersion}" ]; then
echo "Image version \"${imgVersion}\" is different from userdata version \"${curVersion}\""

# Make a backup of userdata
backupFile=userdata-$(date +"%FT%H:%M:%S").tar
tar cf /tmp/${backupFile} ${APPDIR}/userdata
if [ ! -d "${APPDIR}/userdata/backup" ]; then
mkdir ${APPDIR}/userdata/backup
fi
cp /tmp/${backupFile} ${APPDIR}/userdata/backup/
echo "You can find backup of userdata in ${APPDIR}/userdata/backup/${backupFile}"

# Copy over the updated files
cp ${APPDIR}/userdata.dist/etc/all.policy ${APPDIR}/userdata/etc/
cp ${APPDIR}/userdata.dist/etc/branding.properties ${APPDIR}/userdata/etc/
cp ${APPDIR}/userdata.dist/etc/branding-ssh.properties ${APPDIR}/userdata/etc/
cp ${APPDIR}/userdata.dist/etc/config.properties ${APPDIR}/userdata/etc/
cp ${APPDIR}/userdata.dist/etc/custom.properties ${APPDIR}/userdata/etc/
cp ${APPDIR}/userdata.dist/etc/version.properties ${APPDIR}/userdata/etc/
cp ${APPDIR}/userdata.dist/etc/distribution.info ${APPDIR}/userdata/etc/
cp ${APPDIR}/userdata.dist/etc/jre.properties ${APPDIR}/userdata/etc/
cp ${APPDIR}/userdata.dist/etc/profile.cfg ${APPDIR}/userdata/etc/
cp ${APPDIR}/userdata.dist/etc/startup.properties ${APPDIR}/userdata/etc
cp ${APPDIR}/userdata.dist/etc/org.apache.karaf* ${APPDIR}/userdata/etc/
cp ${APPDIR}/userdata.dist/etc/org.ops4j.pax.url.mvn.cfg ${APPDIR}/userdata/etc/
echo "Replaced files in userdata/etc with newer versions"

# Clear the cache and tmp
rm -rf ${APPDIR}/userdata/cache/*
rm -rf ${APPDIR}/userdata/tmp/*
echo "Cleared the cache and tmp"
fi

if [ -z "$(ls -A "${APPDIR}/conf")" ]; then
# Copy userdata dir for version 2.0.0
echo "No configuration found... initializing."
Expand Down
37 changes: 37 additions & 0 deletions 1.8.3/i386/alpine/entrypoint.sh
View file
Open in desktop
Expand Up @@ -37,6 +37,43 @@ case ${OPENHAB_VERSION} in
cp -av "${APPDIR}/userdata.dist/." "${APPDIR}/userdata/"
fi

# Upgrade userdata if versions do not match
curVersion=$(< ${APPDIR}/userdata/etc/version.properties grep build-no | cut -d : -f 2 | tr -d '[:space]')
imgVersion=$(< ${APPDIR}/userdata.dist/etc/version.properties grep build-no | cut -d : -f 2 | tr -d '[:space]')
echo "Current \"${curVersion}\" Image \"${imgVersion}\"" # TODO remove
if [ "${curVersion}" != "${imgVersion}" ]; then
echo "Image version \"${imgVersion}\" is different from userdata version \"${curVersion}\""

# Make a backup of userdata
backupFile=userdata-$(date +"%FT%H:%M:%S").tar
tar cf /tmp/${backupFile} ${APPDIR}/userdata
if [ ! -d "${APPDIR}/userdata/backup" ]; then
mkdir ${APPDIR}/userdata/backup
fi
cp /tmp/${backupFile} ${APPDIR}/userdata/backup/
echo "You can find backup of userdata in ${APPDIR}/userdata/backup/${backupFile}"

# Copy over the updated files
cp ${APPDIR}/userdata.dist/etc/all.policy ${APPDIR}/userdata/etc/
cp ${APPDIR}/userdata.dist/etc/branding.properties ${APPDIR}/userdata/etc/
cp ${APPDIR}/userdata.dist/etc/branding-ssh.properties ${APPDIR}/userdata/etc/
cp ${APPDIR}/userdata.dist/etc/config.properties ${APPDIR}/userdata/etc/
cp ${APPDIR}/userdata.dist/etc/custom.properties ${APPDIR}/userdata/etc/
cp ${APPDIR}/userdata.dist/etc/version.properties ${APPDIR}/userdata/etc/
cp ${APPDIR}/userdata.dist/etc/distribution.info ${APPDIR}/userdata/etc/
cp ${APPDIR}/userdata.dist/etc/jre.properties ${APPDIR}/userdata/etc/
cp ${APPDIR}/userdata.dist/etc/profile.cfg ${APPDIR}/userdata/etc/
cp ${APPDIR}/userdata.dist/etc/startup.properties ${APPDIR}/userdata/etc
cp ${APPDIR}/userdata.dist/etc/org.apache.karaf* ${APPDIR}/userdata/etc/
cp ${APPDIR}/userdata.dist/etc/org.ops4j.pax.url.mvn.cfg ${APPDIR}/userdata/etc/
echo "Replaced files in userdata/etc with newer versions"

# Clear the cache and tmp
rm -rf ${APPDIR}/userdata/cache/*
rm -rf ${APPDIR}/userdata/tmp/*
echo "Cleared the cache and tmp"
fi

if [ -z "$(ls -A "${APPDIR}/conf")" ]; then
# Copy userdata dir for version 2.0.0
echo "No configuration found... initializing."
Expand Down