From ce4aca9a72670fd44cf431c31ea3e86769bb53fc Mon Sep 17 00:00:00 2001 From: bbedward Date: Sat, 13 Dec 2025 00:29:20 -0500 Subject: [PATCH] fix shellcheck --- distro/scripts/ppa-build.sh | 4 +--- distro/scripts/ppa-upload.sh | 7 +++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/distro/scripts/ppa-build.sh b/distro/scripts/ppa-build.sh index aad7ec8a..ac869986 100755 --- a/distro/scripts/ppa-build.sh +++ b/distro/scripts/ppa-build.sh @@ -239,7 +239,6 @@ if [ "$IS_GIT_PACKAGE" = false ] && [ -n "$GIT_REPO" ]; then NEW_VERSION="${BASE_VERSION}ppa${PPA_NUM}" fi - CHANGELOG_UPDATED=false if [ "$CURRENT_VERSION" != "$NEW_VERSION" ]; then if [ "$PPA_NUM" -gt 1 ]; then info "Updating changelog for rebuild (PPA number incremented to $PPA_NUM)" @@ -270,7 +269,6 @@ if [ "$IS_GIT_PACKAGE" = false ] && [ -n "$GIT_REPO" ]; then echo "$CHANGELOG_CONTENT" >>debian/changelog fi success "Version updated to $NEW_VERSION" - CHANGELOG_UPDATED=true CHANGELOG_VERSION=$(dpkg-parsechangelog -S Version) info "Writing updated changelog back to repository..." @@ -536,7 +534,7 @@ if yes | DEBIAN_FRONTEND=noninteractive debuild -S $DEBUILD_SOURCE_FLAG -d; then TEMP_MARKER_FILE="$PACKAGE_PARENT/.ppa_build_temp_${PACKAGE_NAME}" echo "PPA_BUILD_TEMP_DIR=$TEMP_WORK_DIR" > "$TEMP_MARKER_FILE" - + if [[ -z "${PPA_UPLOAD_SCRIPT:-}" ]] && ! pgrep -f "ppa-upload.sh" >/dev/null 2>&1; then info "Copying build artifacts to $PACKAGE_PARENT (standalone build)..." cp -v "$TEMP_WORK_DIR"/"${SOURCE_NAME}"_"${CHANGELOG_VERSION}"* "$PACKAGE_PARENT/" 2>/dev/null || true diff --git a/distro/scripts/ppa-upload.sh b/distro/scripts/ppa-upload.sh index 1ec380bd..68568294 100755 --- a/distro/scripts/ppa-upload.sh +++ b/distro/scripts/ppa-upload.sh @@ -161,8 +161,8 @@ else done echo " a. all" echo "" - read -p "Select package (1-${#AVAILABLE_PACKAGES[@]}, a): " selection - + read -rp "Select package (1-${#AVAILABLE_PACKAGES[@]}, a): " selection + if [[ "$selection" == "a" ]] || [[ "$selection" == "all" ]]; then PACKAGE_INPUT="all" BUILD_ARGS=("all" "$PPA_NAME_INPUT" "$UBUNTU_SERIES") @@ -212,8 +212,7 @@ fi TEMP_DIR_FILE="$PARENT_DIR/.ppa_build_temp_${PACKAGE_NAME}" if [ -f "$TEMP_DIR_FILE" ]; then - source "$TEMP_DIR_FILE" - BUILD_TEMP_DIR="$PPA_BUILD_TEMP_DIR" + BUILD_TEMP_DIR=$(grep -oP 'PPA_BUILD_TEMP_DIR=\K.*' "$TEMP_DIR_FILE") rm -f "$TEMP_DIR_FILE" info "Using build artifacts from temp directory: $BUILD_TEMP_DIR" CHANGES_FILE=$(find "$BUILD_TEMP_DIR" -maxdepth 1 -name "${PACKAGE_NAME}_*_source.changes" -type f 2>/dev/null | sort -V | tail -1)