Skip to content

Commit 1cd08ff

Browse files
authored
build(source-os): make installed sourceos-office install path work (#154)
* build(source-os): stage installed shell installer helper * build(source-os): exercise installed sourceos-office install path in shell smoke
1 parent 0f55b8f commit 1cd08ff

2 files changed

Lines changed: 11 additions & 1 deletion

File tree

build/office-suite/scripts/install_sourceos_office_shell.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,15 @@ BIN_DIR="$HOME/.local/bin"
99

1010
mkdir -p "$BIN_DIR"
1111
cp "$ROOT/build/office-suite/scripts/sourceos-office" "$BIN_DIR/sourceos-office"
12+
cp "$ROOT/build/office-suite/scripts/install_sourceos_office_shell.sh" "$BIN_DIR/install_sourceos_office_shell.sh"
1213
cp "$ROOT/build/office-suite/scripts/office_shell_verify.sh" "$BIN_DIR/office_shell_verify.sh"
13-
chmod +x "$BIN_DIR/sourceos-office" "$BIN_DIR/office_shell_verify.sh"
14+
chmod +x "$BIN_DIR/sourceos-office" "$BIN_DIR/install_sourceos_office_shell.sh" "$BIN_DIR/office_shell_verify.sh"
1415

1516
if [[ -x "$ROOT/build/office-suite/scripts/verify_office_suite_profile.sh" ]]; then
1617
"$ROOT/build/office-suite/scripts/verify_office_suite_profile.sh"
1718
fi
1819

1920
echo "installed sourceos-office to $BIN_DIR/sourceos-office"
21+
echo "installed install_sourceos_office_shell.sh to $BIN_DIR/install_sourceos_office_shell.sh"
2022
echo "installed office_shell_verify.sh to $BIN_DIR/office_shell_verify.sh"
2123
echo "SourceOS office shell install completed"

build/office-suite/scripts/install_sourceos_office_shell_smoke.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ mkdir -p "$HOME"
1515
DESKTOP_FILE="$XDG_DATA_HOME/applications/sourceos-office.desktop"
1616
OPEN_BIN="$HOME/.local/bin/sourceos-office-open"
1717
SOURCEOS_OFFICE_BIN="$HOME/.local/bin/sourceos-office"
18+
INSTALL_BIN="$HOME/.local/bin/install_sourceos_office_shell.sh"
1819
VERIFY_BIN="$HOME/.local/bin/office_shell_verify.sh"
1920
CLOUD_BIN="$HOME/.local/bin/office_cloud_handoff.sh"
2021
MIME_FILE="$XDG_CONFIG_HOME/mimeapps.list"
@@ -36,6 +37,11 @@ echo "SourceOS office shell smoke" > "$TEST_DOC"
3637
exit 1
3738
}
3839

40+
[[ -x "$INSTALL_BIN" ]] || {
41+
echo "office shell installer smoke failed: missing install_sourceos_office_shell helper" >&2
42+
exit 1
43+
}
44+
3945
[[ -x "$VERIFY_BIN" ]] || {
4046
echo "office shell installer smoke failed: missing office_shell_verify helper" >&2
4147
exit 1
@@ -84,4 +90,6 @@ case "$SEARCH_OUT" in
8490
;;
8591
esac
8692

93+
"$SOURCEOS_OFFICE_BIN" install >/dev/null
94+
8795
echo "office shell installer smoke passed"

0 commit comments

Comments
 (0)