fix path

ome · Jul 4, 2022 · ca4f52c · ca4f52c
1 parent 5afc192
commit ca4f52c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/omero/autogen_docs b/omero/autogen_docs
@@ -87,7 +87,7 @@ echo "Getting db properties"
 omero/autogen_db_version.py $WORKSPACE/OMERO.server > omero/conf_autogen.py
 
 echo "Update dependencies"
-bash dependencies.sh
+bash omero/dependencies.sh
 
 
 echo "Cleanup"

diff --git a/omero/dependencies.sh b/omero/dependencies.sh
@@ -27,7 +27,7 @@ for dir in "${dirs[@]}"
         repopath="https://artifacts.openmicroscopy.org/artifactory/ome.releases/${dir}"
         version=`curl -s ${repopath}/maven-metadata.xml | grep latest | sed "s/.*<latest>\([^<]*\)<\/latest>.*/\1/"`
         echo $version
-        sed -i -e "s/version_${v} = .*/version_${v} = \"${version}\"/" conf_autogen.py
+        sed -i -e "s/version_${v} = .*/version_${v} = \"${version}\"/" omero/conf_autogen.py
     done
 
 # GitHub packages
@@ -54,7 +54,7 @@ do
         done < conf_autogen.py
     fi
 
-    sed -i -e "s/version_${v} = .*/version_${v} = \"${version}\"/" conf_autogen.py
+    sed -i -e "s/version_${v} = .*/version_${v} = \"${version}\"/" omero/conf_autogen.py
 done
 
 echo $new_version
@@ -77,7 +77,7 @@ if [ ! -z $new_version ]; then
         version=`unzip -p $dir META-INF/MANIFEST.MF | grep "Implementation-Version:" | sed 's/^.*[^0-9]\([0-9]*\.[0-9]*\.[0-9]*\).*$/\1/'`
         echo $v
         echo $version
-        sed -i -e "s/version_${v} = .*/version_${v} = \"${version}\"/" conf_autogen.py
+        sed -i -e "s/version_${v} = .*/version_${v} = \"${version}\"/" omero/onf_autogen.py
     done
     # clean up 
     rm -rf OMERO.server*
@@ -93,10 +93,13 @@ do
     echo $v
     version=`curl -Ls https://pypi.org/pypi/$package/json | jq -r .info.version`
     echo $version
-    sed -i -e "s/version_${v} = .*/version_${v} = \"${version}\"/" conf_autogen.py
+    sed -i -e "s/version_${v} = .*/version_${v} = \"${version}\"/" omero/conf_autogen.py
 done
 
 
 
 # Clean up
-rm conf_autogen.py-e
+if [ -f omero/conf_autogen.py-e ]; then
+    rm omero/conf_autogen.py-e
+fi
+