Skip to content

Commit 2e3063c

Browse files
update scripts.
1 parent 621bd5c commit 2e3063c

File tree

5 files changed

+25
-25
lines changed

5 files changed

+25
-25
lines changed

src/devcontainers/loaded/.devcontainer/scripts/start.sh

Whitespace-only changes.

src/devcontainers/loaded/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ build:
77
devcontainer build \
88
--push false \
99
--workspace-folder $(WORKSPACE_FOLDER) \
10-
--image-name "$(IMAGE_NAME)"
10+
--image-name "$(IMAGE_NAME)"

src/devcontainers/loaded/devcontainer-template.json

Lines changed: 0 additions & 21 deletions
This file was deleted.

src/features/nhsnotify/install.sh

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,28 @@
11
#!/bin/bash
22

3+
add_asdf_to_path(){
4+
echo "adding asdf to path"
5+
export PATH="${ASDF_DATA_DIR:-$HOME/.asdf}/shims:$PATH"
6+
echo "added asdf to path"
7+
}
8+
9+
echo "Starting NHS Notify feature installation script"
10+
311
SHARE_DIR="/usr/local/share/nhsnotify"
12+
echo "Share dir is $SHARE_DIR"
413
mkdir -p $SHARE_DIR
514
cp -r ./scripts $SHARE_DIR
615

16+
echo "Setup share dir, contents:"
17+
pwd $SHARE_DIR
18+
ls -la $SHARE_DIR
19+
20+
echo "Configuring APT packages"
721
. $SHARE_DIR/scripts/configure-apt.sh
22+
echo "APT packages configured"
823

924
echo "go is at $(which go)"
1025
echo 'install asdf via go'
1126
go install github.com/asdf-vm/asdf/cmd/[email protected]
27+
add_asdf_to_path
28+
echo "Finished NHS Notify feature installation script"

src/features/nhsnotify/scripts/postcreatecommand.sh

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ update_from_template(){
7575
echo "$REPO template update complete"
7676
}
7777

78-
update_from_template_if_enabled(){
78+
execute_update_from_template(){
7979
if [ "${update_from_template}" == "true" ]; then
8080
echo "Updating from template as per configuration"
8181
get_repo_template
@@ -117,10 +117,14 @@ add_gpg_tty_to_zshrc(){
117117
echo "added gpg tty to zshrc"
118118
}
119119

120-
update_from_template_if_enabled
120+
echo "starting post create command script"
121+
122+
execute_update_from_template
121123
reload_shell
122124
add_asdf_to_path
123125
sort_certs
124126
configure_ohmyzsh
125127
add_gpg_tty_to_zshrc
126-
cd $CURRENT_DIR
128+
cd $CURRENT_DIR
129+
130+
echo "completed post create command script"

0 commit comments

Comments
 (0)