From bf0107dbb0189d3b6c32a313bfb104c6977e7359 Mon Sep 17 00:00:00 2001 From: thomas Date: Thu, 16 Jun 2022 18:52:13 +0200 Subject: [PATCH 1/2] rstudio: create build script cp rstudio-debpkg-1.4.1717-0.build.sh \ rstudio-2022.02.3-492-0.build.sh --- rstudio-2022.02.3-492-0.build.sh | 70 ++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100755 rstudio-2022.02.3-492-0.build.sh diff --git a/rstudio-2022.02.3-492-0.build.sh b/rstudio-2022.02.3-492-0.build.sh new file mode 100755 index 0000000..08e07cb --- /dev/null +++ b/rstudio-2022.02.3-492-0.build.sh @@ -0,0 +1,70 @@ +#! /bin/bash + +# utilize the 'debian'-package from rstudio site, take for reference, or fallback + +PKG=rstudio-debpkg +VERSION=1.4.1717 +BUILD=0 + +PREFIX=/pkg/$PKG-$VERSION-$BUILD +if [ -n "$TESTING" ]; then PREFIX=/dev/shm/$PKG-$VERSION-$BUILD ; fi + +set -xe +umask 022 + +BUILD_TMPDIR=/dev/shm/$PKG-$VERSION-$BUILD.build.tmp +test -d $BUILD_TMPDIR && ( chmod -R u+rwx $BUILD_TMPDIR || true ; rm -rf $BUILD_TMPDIR ) +mkdir -p $BUILD_TMPDIR/home +export TMPDIR=$BUILD_TMPDIR +export HOME=$BUILD_TMPDIR/home + +# mind the PATH ... +# ---------------------------- +# it should work with: +# prun R4 rstudio +# xfce launcher +# own R on the path + +mkdir -p $PREFIX +cat >$PREFIX/profile <<-EOF + PATH=$PREFIX/bin:\$PATH:/usr/local/package/bin + if [ -d $PREFIX/.compatlibs ]; then export LD_LIBRARY_PATH=$PREFIX/.compatlibs\${LD_LIBRARY_PATH:+:}\$LD_LIBRARY_PATH ; fi +EOF +. $PREFIX/profile + +BUILD=$PREFIX/build + +mkdir -p $BUILD +cd $BUILD + +# orig: https://download1.rstudio.org/desktop/bionic/amd64/rstudio-1.4.1717-amd64-debian.tar.gz +BEEHIVE=https://beehive.molgen.mpg.de/4fb9f00470f0c938df9e7319c54b7b4d/rstudio-1.4.1717-amd64-debian.tar.gz + +test -e rstudio-$VERSION-amd64-debian.tar.gz || wget -nv $BEEHIVE +test -d rstudio-$VERSION || tar -xf rstudio-$VERSION-amd64-debian.tar.gz + +mv -v rstudio-$VERSION/* .. + +cat >$PREFIX/bin/rstudio-nv <<-'EOF' + #! /bin/bash + + # This allows using rstudio on a compute server, when the users machine + # has the nvidia driver loaded and rstudio gets confused. + # Drawback, this only works if not part of a ssh hopp along chain. + + if [ -n "$SSH_CLIENT" ]; then + REMOTEIP=${SSH_CLIENT%% *} + MXGFX=$(ssh $REMOTEIP readlink -f /node/usr_share_mxgfx | grep nvidia) + if [ -n "$MXGFX" ]; then + echo "# offering $MXGFX to desktop client..." + LD_LIBRARY_PATH=$MXGFX/lib${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH + export LD_LIBRARY_PATH + fi + fi + + exec rstudio "${@+$@}" +EOF + +chmod +x $PREFIX/bin/rstudio-nv + +exit From 74dda9afb6127fca36c3c51db3ecf75d0c975427 Mon Sep 17 00:00:00 2001 From: thomas Date: Thu, 16 Jun 2022 18:59:05 +0200 Subject: [PATCH 2/2] rstudio: adjust version --- rstudio-2022.02.3-492-0.build.sh | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/rstudio-2022.02.3-492-0.build.sh b/rstudio-2022.02.3-492-0.build.sh index 08e07cb..909dab2 100755 --- a/rstudio-2022.02.3-492-0.build.sh +++ b/rstudio-2022.02.3-492-0.build.sh @@ -1,9 +1,10 @@ #! /bin/bash -# utilize the 'debian'-package from rstudio site, take for reference, or fallback +# use the debian build from rstudio site (Ubuntu 18+/Debian 10+) -PKG=rstudio-debpkg -VERSION=1.4.1717 +PKG=rstudio +VERSION=2022.02.3-492 +VERSIONP=${VERSION/-/+} # just brilliant ! BUILD=0 PREFIX=/pkg/$PKG-$VERSION-$BUILD @@ -12,7 +13,7 @@ if [ -n "$TESTING" ]; then PREFIX=/dev/shm/$PKG-$VERSION-$BUILD ; fi set -xe umask 022 -BUILD_TMPDIR=/dev/shm/$PKG-$VERSION-$BUILD.build.tmp +BUILD_TMPDIR=/dev/shm/$PKG-$VERSION-$BUILD.$USER.build.tmp test -d $BUILD_TMPDIR && ( chmod -R u+rwx $BUILD_TMPDIR || true ; rm -rf $BUILD_TMPDIR ) mkdir -p $BUILD_TMPDIR/home export TMPDIR=$BUILD_TMPDIR @@ -37,13 +38,13 @@ BUILD=$PREFIX/build mkdir -p $BUILD cd $BUILD -# orig: https://download1.rstudio.org/desktop/bionic/amd64/rstudio-1.4.1717-amd64-debian.tar.gz -BEEHIVE=https://beehive.molgen.mpg.de/4fb9f00470f0c938df9e7319c54b7b4d/rstudio-1.4.1717-amd64-debian.tar.gz +# orig: https://download1.rstudio.org/desktop/bionic/amd64/rstudio-2022.02.3-492-amd64-debian.tar.gz +BEEHIVE=https://beehive.molgen.mpg.de/f68c6713864cc12967a7414ab6040e1f/rstudio-2022.02.3-492-amd64-debian.tar.gz test -e rstudio-$VERSION-amd64-debian.tar.gz || wget -nv $BEEHIVE -test -d rstudio-$VERSION || tar -xf rstudio-$VERSION-amd64-debian.tar.gz +test -d rstudio-$VERSIONP || tar -xf rstudio-$VERSION-amd64-debian.tar.gz -mv -v rstudio-$VERSION/* .. +mv -v rstudio-$VERSIONP/* .. cat >$PREFIX/bin/rstudio-nv <<-'EOF' #! /bin/bash