From 15c63a98b714d3845e602dba883cbc9cca43a9b6 Mon Sep 17 00:00:00 2001 From: david Date: Wed, 28 Feb 2024 13:07:31 +0100 Subject: [PATCH 1/2] rstudio: copy of previous script --- rstudio-2023.12.1-402-0.build.sh | 71 ++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 rstudio-2023.12.1-402-0.build.sh diff --git a/rstudio-2023.12.1-402-0.build.sh b/rstudio-2023.12.1-402-0.build.sh new file mode 100644 index 0000000..909dab2 --- /dev/null +++ b/rstudio-2023.12.1-402-0.build.sh @@ -0,0 +1,71 @@ +#! /bin/bash + +# use the debian build from rstudio site (Ubuntu 18+/Debian 10+) + +PKG=rstudio +VERSION=2022.02.3-492 +VERSIONP=${VERSION/-/+} # just brilliant ! +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.$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 +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-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-$VERSIONP || tar -xf rstudio-$VERSION-amd64-debian.tar.gz + +mv -v rstudio-$VERSIONP/* .. + +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 5a21b270a850abc090fc676a97f6cfde87df453b Mon Sep 17 00:00:00 2001 From: david Date: Wed, 28 Feb 2024 14:10:39 +0100 Subject: [PATCH 2/2] rstudio: update to version 2023.12.1 Abeera ask for new highlighting feature --- rstudio-2023.12.1-402-0.build.sh | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) mode change 100644 => 100755 rstudio-2023.12.1-402-0.build.sh diff --git a/rstudio-2023.12.1-402-0.build.sh b/rstudio-2023.12.1-402-0.build.sh old mode 100644 new mode 100755 index 909dab2..b005c2c --- a/rstudio-2023.12.1-402-0.build.sh +++ b/rstudio-2023.12.1-402-0.build.sh @@ -1,14 +1,14 @@ #! /bin/bash -# use the debian build from rstudio site (Ubuntu 18+/Debian 10+) +# use the debian build from rstudio site (Ubuntu 20+/Debian 11+) PKG=rstudio -VERSION=2022.02.3-492 +VERSION=2023.12.1-402 VERSIONP=${VERSION/-/+} # just brilliant ! BUILD=0 PREFIX=/pkg/$PKG-$VERSION-$BUILD -if [ -n "$TESTING" ]; then PREFIX=/dev/shm/$PKG-$VERSION-$BUILD ; fi +if [ -n "$TESTING" ]; then PREFIX=/scratch/local2/$PKG-$VERSION-$BUILD ; fi set -xe umask 022 @@ -38,13 +38,15 @@ BUILD=$PREFIX/build mkdir -p $BUILD cd $BUILD -# 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 +# orig: https://download1.rstudio.org/electron/focal/amd64/rstudio-2023.12.1-402-amd64-debian.tar.gz +BEEHIVE=https://beehive.molgen.mpg.de/205ead7b954470207e8cdb6614d68172/rstudio-2023.12.1-402-amd64-debian.tar.gz test -e rstudio-$VERSION-amd64-debian.tar.gz || wget -nv $BEEHIVE test -d rstudio-$VERSIONP || tar -xf rstudio-$VERSION-amd64-debian.tar.gz -mv -v rstudio-$VERSIONP/* .. +mkdir ${PREFIX}/bin + +mv -v rstudio-$VERSIONP/* ../bin cat >$PREFIX/bin/rstudio-nv <<-'EOF' #! /bin/bash