diff --git a/build/office-suite/scripts/install_sourceos_office_shell.sh b/build/office-suite/scripts/install_sourceos_office_shell.sh index 65527af..1a4a5d9 100644 --- a/build/office-suite/scripts/install_sourceos_office_shell.sh +++ b/build/office-suite/scripts/install_sourceos_office_shell.sh @@ -9,13 +9,15 @@ BIN_DIR="$HOME/.local/bin" mkdir -p "$BIN_DIR" cp "$ROOT/build/office-suite/scripts/sourceos-office" "$BIN_DIR/sourceos-office" +cp "$ROOT/build/office-suite/scripts/install_sourceos_office_shell.sh" "$BIN_DIR/install_sourceos_office_shell.sh" cp "$ROOT/build/office-suite/scripts/office_shell_verify.sh" "$BIN_DIR/office_shell_verify.sh" -chmod +x "$BIN_DIR/sourceos-office" "$BIN_DIR/office_shell_verify.sh" +chmod +x "$BIN_DIR/sourceos-office" "$BIN_DIR/install_sourceos_office_shell.sh" "$BIN_DIR/office_shell_verify.sh" if [[ -x "$ROOT/build/office-suite/scripts/verify_office_suite_profile.sh" ]]; then "$ROOT/build/office-suite/scripts/verify_office_suite_profile.sh" fi echo "installed sourceos-office to $BIN_DIR/sourceos-office" +echo "installed install_sourceos_office_shell.sh to $BIN_DIR/install_sourceos_office_shell.sh" echo "installed office_shell_verify.sh to $BIN_DIR/office_shell_verify.sh" echo "SourceOS office shell install completed" diff --git a/build/office-suite/scripts/install_sourceos_office_shell_smoke.sh b/build/office-suite/scripts/install_sourceos_office_shell_smoke.sh index 3fcf75f..dfc2adf 100644 --- a/build/office-suite/scripts/install_sourceos_office_shell_smoke.sh +++ b/build/office-suite/scripts/install_sourceos_office_shell_smoke.sh @@ -15,6 +15,7 @@ mkdir -p "$HOME" DESKTOP_FILE="$XDG_DATA_HOME/applications/sourceos-office.desktop" OPEN_BIN="$HOME/.local/bin/sourceos-office-open" SOURCEOS_OFFICE_BIN="$HOME/.local/bin/sourceos-office" +INSTALL_BIN="$HOME/.local/bin/install_sourceos_office_shell.sh" VERIFY_BIN="$HOME/.local/bin/office_shell_verify.sh" CLOUD_BIN="$HOME/.local/bin/office_cloud_handoff.sh" MIME_FILE="$XDG_CONFIG_HOME/mimeapps.list" @@ -36,6 +37,11 @@ echo "SourceOS office shell smoke" > "$TEST_DOC" exit 1 } +[[ -x "$INSTALL_BIN" ]] || { + echo "office shell installer smoke failed: missing install_sourceos_office_shell helper" >&2 + exit 1 +} + [[ -x "$VERIFY_BIN" ]] || { echo "office shell installer smoke failed: missing office_shell_verify helper" >&2 exit 1 @@ -84,4 +90,6 @@ case "$SEARCH_OUT" in ;; esac +"$SOURCEOS_OFFICE_BIN" install >/dev/null + echo "office shell installer smoke passed"