obel1x/fedora-OEMDRV
0
0
Fork 1
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Fedora 44, install/configure improvements, Nextcloud desktop client fixes #24

Merged
obel1x merged 27 commits from unbrot/fedora-OEMDRV:main into main 2026-05-04 17:00:04 +02:00
Conversation 0 Commits 27 Files Changed 19
+5 -7
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2e329a3807 - Show all commits
system_setup/install.sh
+5 -7
View File
@@ -69,7 +69,7 @@ do_clone_and_done() {
info "Cloning $REPO_URL into $MOUNT_POINT..." info "Cloning $REPO_URL into $MOUNT_POINT..."
cd "$MOUNT_POINT" || die "Cannot cd to $MOUNT_POINT." cd "$MOUNT_POINT" || die "Cannot cd to $MOUNT_POINT."
git clone --progress --depth 1 -b $REPO_BRANCH "$REPO_URL" . || die "git clone failed." git clone --progress --depth 1 -b $REPO_BRANCH "$REPO_URL" . || die "git clone failed."
source "$(dirname "$0")/setup_system.inc.sh" ${MOUNT_POINT}/setup_system.inc.sh
finish_install "$dev" finish_install "$dev"
} }
@@ -361,10 +361,8 @@ if [[ -n "$EXISTING_OEMDRV_DEV" ]]; then
fi fi
if [[ -f "$MOUNT_POINT/system_setup/setup_system.inc.sh" && -f "$MOUNT_POINT/config/setup_system.conf" ]]; then if [[ -f "$MOUNT_POINT/system_setup/setup_system.inc.sh" && -f "$MOUNT_POINT/config/setup_system.conf" ]]; then
info "Sourcing existing setup_system.inc.sh..." info "Reading existing configuration..."
pushd "$MOUNT_POINT/system_setup" > /dev/null $MOUNT_POINT/system_setup/setup_system.inc.sh
source setup_system.inc.sh
popd > /dev/null
fi fi
# ── Check existing git repository origin ────────────────────────────── # ── Check existing git repository origin ──────────────────────────────
@@ -393,7 +391,7 @@ if [[ -n "$EXISTING_OEMDRV_DEV" ]]; then
|| die "git fetch failed." || die "git fetch failed."
git -C "$MOUNT_POINT" checkout -B "$REPO_BRANCH" FETCH_HEAD \ git -C "$MOUNT_POINT" checkout -B "$REPO_BRANCH" FETCH_HEAD \
|| die "git checkout failed." || die "git checkout failed."
source "$MOUNT_POINT/system_setup/setup_system.inc.sh" $MOUNT_POINT/system_setup/setup_system.inc.sh
finish_install "$EXISTING_OEMDRV_DEV" finish_install "$EXISTING_OEMDRV_DEV"
exit 0 exit 0
;; ;;
@@ -405,7 +403,7 @@ if [[ -n "$EXISTING_OEMDRV_DEV" ]]; then
|| die "git fetch failed." || die "git fetch failed."
git -C "$MOUNT_POINT" checkout -B "$REPO_BRANCH" FETCH_HEAD \ git -C "$MOUNT_POINT" checkout -B "$REPO_BRANCH" FETCH_HEAD \
|| die "git checkout failed." || die "git checkout failed."
source "$MOUNT_POINT/system_setup/setup_system.inc.sh" $MOUNT_POINT/system_setup/setup_system.inc.sh
finish_install "$EXISTING_OEMDRV_DEV" finish_install "$EXISTING_OEMDRV_DEV"
exit 0 exit 0
;; ;;