From 7119e9b8e3c1f3fc1252c70f8fd172754e27a01e Mon Sep 17 00:00:00 2001 From: Ava Affine Date: Wed, 21 Feb 2024 12:04:51 -0800 Subject: [PATCH] fix install script and release ci Signed-off-by: Ava Affine --- .gitlab-ci.yml | 1 + snippets/release/install.sh | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6793d42..6a193d8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -40,6 +40,7 @@ prepare-release: --xform='s,target/release/,,' \ --xform='s,snippets/,,' \ --xform='s,snippets/release/,,' \ + --xform='s,release/,,' \ target/release/flesh \ Readme.org Writing.org Shell.org \ snippets/flesh-mode.el \ diff --git a/snippets/release/install.sh b/snippets/release/install.sh index 168a946..dd1e1ae 100644 --- a/snippets/release/install.sh +++ b/snippets/release/install.sh @@ -1,6 +1,6 @@ #!/bin/sh -if [ ! "$USER" == "root" ]; then +if [ "$USER" != "root" ]; then echo you will likely need root to place in /bin. echo comment out this test to continue without it exit @@ -25,8 +25,9 @@ fi mv userlib.f $libdir mv genbind.f $libdir mv interactive-devel.f $libdir -mv default_fleshrc.f /home/$USER/.fleshrc +mv default_fleshrc.f /home/$SUDO_USER/.fleshrc chown -R $SUDO_USER:$SUDO_USER $libdir +chown $SUDO_USER:$SUDO_USER /home/$SUDO_USER/.fleshrc mv flesh /bin/flesh chmod +x /bin/flesh