Skip to content
This repository has been archived by the owner on Dec 26, 2022. It is now read-only.

Rename 'etc/chromeos/setup_chromeos' to 'etc/deb_linux/setup_linux' #2092

Merged
merged 1 commit into from
Nov 5, 2022
Merged

Rename 'etc/chromeos/setup_chromeos' to 'etc/deb_linux/setup_linux' #2092

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion devbox/provision/provision.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ source "${GRAPL_DEVBOX_CONFIG}"
# Gotta do the https because our ssh key can't read from github
git clone https://github.com/grapl-security/grapl.git
cd grapl
./etc/chromeos/setup_chromeos.sh
./etc/deb_linux/setup_linux.sh
fi
EOF
)"
Expand Down
0 etc/chromeos/BUILD → etc/deb_linux/BUILD
View file
Open in desktop
File renamed without changes.
0 etc/chromeos/lib/BUILD → etc/deb_linux/lib/BUILD
View file
Open in desktop
File renamed without changes.
0 etc/chromeos/lib/installs.sh → etc/deb_linux/lib/installs.sh
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion etc/chromeos/setup_chromeos.sh → etc/deb_linux/setup_linux.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

set -euo pipefail

source etc/chromeos/lib/installs.sh
source etc/deb_linux/lib/installs.sh

echo "Starting ChromeOS automated setup"

Expand Down
2 changes: 1 addition & 1 deletion etc/chromeos/setup_optional_tools.sh → etc/deb_linux/setup_optional_tools.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

set -euo pipefail

source etc/chromeos/lib/installs.sh
source etc/deb_linux/lib/installs.sh

echo "Starting Grapl OPTIONAL tooling installation"
install_git_hooks
4 changes: 2 additions & 2 deletions etc/hooks/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ the grapl repo. In particular, these should be local only, not global.
## Enabling git hooks

This should be automatically enabled as part of the
`etc/chromeos/setup_chromeos.sh` script. To manually enable a specific git hook
`etc/deb_linux/setup_linux.sh` script. To manually enable a specific git hook
run

```
Expand All @@ -19,5 +19,5 @@ ln --symbolic --relative "$GIT_ROOT/etc/hooks/pre-commit.sh" "$GIT_ROOT/.git/hoo
When creating a new git hook:

1. Make the file executable (and committed to git as executable)
2. Update the chromeos installs script to add the new git hook inside the
2. Update the deb_linux installs script to add the new git hook inside the
install_git_hooks function
4 changes: 2 additions & 2 deletions nomad/local/start_detach.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ ensure_cros_bridge_networking_workaround() {
if ! grep -q "_/bridge.ko" "$module_filepath"; then
echo "It looks like you're on ChromeOS, but haven't installed the Nomad bridge networking workaround."
# shellcheck source-path=SCRIPTDIR
source "${THIS_DIR}/../../etc/chromeos/lib/installs.sh"
source "${THIS_DIR}/../../etc/deb_linux/lib/installs.sh"
(
install_nomad_chromeos_workaround
)
Expand All @@ -38,7 +38,7 @@ ensure_firecracker_driver_installed() {
if [[ ! -f "${expected_cni_path}" ]]; then
echo "It looks like you don't have the Firecracker nomad stuff set up yet."
# shellcheck source-path=SCRIPTDIR
source "${THIS_DIR}/../../etc/chromeos/lib/installs.sh"
source "${THIS_DIR}/../../etc/deb_linux/lib/installs.sh"
(install_nomad_firecracker)
echo "Continuing..."
fi
Expand Down