diff --git a/bundle_onelab.sh b/bundle_onelab.sh index 34ae088908c495174d294b1263a61155c091e6d5..0af5181c43d01555300f1c71efcae94998543a2e 100755 --- a/bundle_onelab.sh +++ b/bundle_onelab.sh @@ -105,16 +105,16 @@ if [ $# -lt 1 ] || [ $1 == "win64" ]; then rm -rf onelab-Windows64* mkdir onelab-Windows64 curl -O https://gmsh.info/bin/Windows/gmsh-${GMSH}-Windows64.zip - # curl -O https://getdp.info/bin/Windows/getdp-${GETDP}-Windows64c.zip - curl -O https://getdp.info/bin/Windows/getdp-${GETDP}-Windows64r.zip + curl -O https://getdp.info/bin/Windows/getdp-${GETDP}-Windows64c.zip + ##curl -O https://getdp.info/bin/Windows/getdp-${GETDP}-Windows64r.zip curl -O https://onelab.info/conveks/bin/conveks-${CONVEKS}-Windows64.zip mv gmsh-${GMSH}-Windows64.zip /tmp - # mv getdp-${GETDP}-Windows64c.zip /tmp - mv getdp-${GETDP}-Windows64r.zip /tmp + mv getdp-${GETDP}-Windows64c.zip /tmp + ##mv getdp-${GETDP}-Windows64r.zip /tmp mv conveks-${CONVEKS}-Windows64.zip /tmp unzip -q -o /tmp/gmsh-${GMSH}-Windows64.zip -d /tmp - # unzip -q -o /tmp/getdp-${GETDP}-Windows64c.zip -d /tmp - unzip -q -o /tmp/getdp-${GETDP}-Windows64r.zip -d /tmp + unzip -q -o /tmp/getdp-${GETDP}-Windows64c.zip -d /tmp + ##unzip -q -o /tmp/getdp-${GETDP}-Windows64r.zip -d /tmp unzip -q -o /tmp/conveks-${CONVEKS}-Windows64.zip -d /tmp cp /tmp/README.txt onelab-Windows64 perl -pi -e 's/\n/\r\n/' onelab-Windows64/README.txt @@ -145,16 +145,16 @@ if [ $# -lt 1 ] || [ $1 == "linux64" ]; then rm -rf onelab-Linux64* mkdir onelab-Linux64 curl -O https://gmsh.info/bin/Linux/gmsh-${GMSH}-Linux64.tgz - #curl -O https://getdp.info/bin/Linux/getdp-${GETDP}-Linux64c.tgz - curl -O https://getdp.info/bin/Linux/getdp-${GETDP}-Linux64r.tgz + curl -O https://getdp.info/bin/Linux/getdp-${GETDP}-Linux64c.tgz + ##curl -O https://getdp.info/bin/Linux/getdp-${GETDP}-Linux64r.tgz curl -O https://onelab.info/conveks/bin/conveks-${CONVEKS}-Linux64.zip mv gmsh-${GMSH}-Linux64.tgz /tmp - #mv getdp-${GETDP}-Linux64c.tgz /tmp - mv getdp-${GETDP}-Linux64r.tgz /tmp + mv getdp-${GETDP}-Linux64c.tgz /tmp + ##mv getdp-${GETDP}-Linux64r.tgz /tmp mv conveks-${CONVEKS}-Linux64.zip /tmp tar zxvf /tmp/gmsh-${GMSH}-Linux64.tgz -C /tmp - #tar zxvf /tmp/getdp-${GETDP}-Linux64c.tgz -C /tmp - tar zxvf /tmp/getdp-${GETDP}-Linux64r.tgz -C /tmp + tar zxvf /tmp/getdp-${GETDP}-Linux64c.tgz -C /tmp + ##tar zxvf /tmp/getdp-${GETDP}-Linux64r.tgz -C /tmp unzip -q -o /tmp/conveks-${CONVEKS}-Linux64.zip -d /tmp cp /tmp/README.txt onelab-Linux64 mv /tmp/gmsh-*${GMSH}-Linux64/bin/gmsh onelab-Linux64 @@ -184,19 +184,19 @@ if [ $# -lt 1 ] || [ $1 == "mac" ]; then rm -rf onelab-MacOSX* mkdir onelab-MacOSX curl -O https://gmsh.info/bin/MacOSX/gmsh-${GMSH}-MacOSX.dmg - #curl -O https://getdp.info/bin/MacOSX/getdp-${GETDP}-MacOSXc.tgz - curl -O https://getdp.info/bin/MacOSX/getdp-${GETDP}-MacOSXr.tgz + curl -O https://getdp.info/bin/MacOSX/getdp-${GETDP}-MacOSXc.tgz + ##curl -O https://getdp.info/bin/MacOSX/getdp-${GETDP}-MacOSXr.tgz curl -O https://onelab.info/conveks/bin/conveks-${CONVEKS}-MacOSX.zip curl -O https://gitlab.onelab.info/gmsh/gmsh/-/raw/master/utils/misc/notarize.py mv gmsh-${GMSH}-MacOSX.dmg /tmp - #mv getdp-${GETDP}-MacOSXc.tgz /tmp + ##mv getdp-${GETDP}-MacOSXc.tgz /tmp mv getdp-${GETDP}-MacOSXr.tgz /tmp mv conveks-${CONVEKS}-MacOSX.zip /tmp mv notarize.py /tmp hdiutil convert /tmp/gmsh-${GMSH}-MacOSX.dmg -format UDTO -o /tmp/gmsh-tmp.cdr hdiutil attach -nobrowse -noverify -noautoopen -mountpoint gmsh_mount /tmp/gmsh-tmp.cdr - #tar zxvf /tmp/getdp-${GETDP}-MacOSXc.tgz -C /tmp - tar zxvf /tmp/getdp-${GETDP}-MacOSXr.tgz -C /tmp + tar zxvf /tmp/getdp-${GETDP}-MacOSXc.tgz -C /tmp + ##tar zxvf /tmp/getdp-${GETDP}-MacOSXr.tgz -C /tmp unzip -q -o /tmp/conveks-${CONVEKS}-MacOSX.zip -d /tmp cp /tmp/README.txt onelab-MacOSX cp -R gmsh_mount/Gmsh.app onelab-MacOSX/