manuth/PortValhalla
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Set default value of NEXTCLOUD_DIR

Browse source
This commit is contained in:
Manuel Thalmann 2023-05-03 18:34:30 +02:00
parent 378cdc846a
commit b358e8a07f
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
profiles/ManuSurface/Arch/install.sh
View file

@ -4,7 +4,7 @@ pushd "${BASH_SOURCE%/*}" > /dev/null;
. "../../../scripts/Arch/Devices/SurfaceBook2/install.sh";
. "../../../scripts/Arch/Collections/school.sh";
NEXTCLOUD_DIR="Nextcloud" \
NEXTCLOUD_DIR="${NEXTCLOUD_DIR}" \
INSTALL_FONTS=0 \
. "../../../scripts/Common/Config/UserProfile/install.sh";

2
profiles/ManuSurface/PopOS/setup.sh
View file

@ -7,7 +7,7 @@ source "../../../scripts/PopOS/Scripts/preinstall.sh";
source "../../../scripts/PopOS/OS/install.sh";
source "../../../scripts/Debian/Devices/SurfaceBook2/Setup/install.sh";
source "../../../scripts/PopOS/Software/Collections/school.sh";
INSTALL_FONTS=1 NEXTCLOUD_DIR="Nextcloud" source "../../../scripts/Common/Config/UserProfile/install.sh";
INSTALL_FONTS=1 NEXTCLOUD_DIR="${NEXTCLOUD_DIR}" source "../../../scripts/Common/Config/UserProfile/install.sh";
# Install equalizer
source "../../../scripts/Common/Config/EasyEffects/SurfaceBook2/install.sh";

2
profiles/PopOSLive/setup.sh
View file

@ -6,7 +6,7 @@ sudo hostnamectl set-hostname ManuPopOSLive;
source "../../scripts/PopOS/Scripts/prepare.sh";
source "../../scripts/PopOS/OS/install.sh";
source "../../scripts/PopOS/Software/Collections/personal.sh";
INSTALL_FONTS=1 NEXTCLOUD_DIR="Nextcloud" source "../../scripts/Common/Config/UserProfile/personal.sh";
INSTALL_FONTS=1 NEXTCLOUD_DIR="${NEXTCLOUD_DIR}" source "../../scripts/Common/Config/UserProfile/personal.sh";
source "../../scripts/PopOS/Scripts/postinstall.sh";
popd > /dev/null;

8
scripts/Common/Config/UserProfile/install.sh
View file

@ -1,5 +1,5 @@
#!/bin/bash
NEXTCLOUD_DIR="${NEXTCLOUD_DIR}";
NEXTCLOUD_DIR="${NEXTCLOUD_DIR:Nextcloud}";
INSTALL_FONTS="${INSTALL_FONTS}";
dir="${BASH_SOURCE%/*}";
pushd "$dir" > /dev/null;
@ -11,15 +11,15 @@ then
fi;
# Sync clouds
. "../rclone/InstallSync.sh" nextcloud "$NEXTCLOUD_DIR";
NEXTCLOUD_DIR="${NEXTCLOUD_DIR}" . "../rclone/InstallSync.sh" nextcloud "$NEXTCLOUD_DIR";
if [ ! -z "$INSTALL_FONTS" ]
then
# Install fonts
source "../Fonts/NerdFont/install.sh";
NEXTCLOUD_DIR="${NEXTCLOUD_DIR}" source "../Fonts/NerdFont/install.sh";
fi;
source "../bash/oh-my-posh.sh";
source "../Oh My Posh/install.sh";
NEXTCLOUD_DIR="${NEXTCLOUD_DIR}" source "../Oh My Posh/install.sh";
popd > /dev/null;