Merge pull request #31 from SpiderOak/push-upgrades-in-tarball

Push upgrades in tarball
SpiderOak · Sep 5, 2013 · 094ddbc · 094ddbc
2 parents 76f65ff + 322e4d7
commit 094ddbc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/bin/upgrade_om.sh b/bin/upgrade_om.sh
@@ -35,9 +35,9 @@ sudo tar xjf $upgrade
 sudo cp $HOME/agent_config.json /opt/openmanage/etc
 
 # Apply SQL updates
-pushd upgrades
+pushd upgrade
 python apply_sql.py
-popd #upgrades
+popd #upgrade
 popd #/opt
 
 sudo sv start openmanage

diff --git a/deploy/make_tarball.sh b/deploy/make_tarball.sh
@@ -50,6 +50,9 @@ pushd $buildit_dir/django > /dev/null
 ./setup_git.sh $buildit_dir
 popd > /dev/null #$buildit_dir/django
 
+# Copy over the upgrades
+cp -r $source_dir/upgrade $buildit_dir
+
 # Setup the SQL package
 mkdir $buildit_dir/sql
 cp $source_dir/sql/*.sql $buildit_dir/sql