Browse Source

recipe doesnt work anymore

main
pvincent 2 weeks ago
parent
commit
1f04e2ca7b
  1. 23
      tools/miaou-create
  2. 6
      tools/miaou-destroy
  3. 3
      tools/miaou-exec
  4. 2
      tools/miaou-ls
  5. 3
      tools/miaou-pull
  6. 5
      tools/miaou-push
  7. 2
      tools/miaou-recipe
  8. 4
      tools/miaou-start
  9. 6
      tools/miaou-stop

23
tools/miaou-create

@ -73,17 +73,6 @@ function mount_miaou_bash {
incus $optional_project config device add $target MIAOU-BASH disk source=$MIAOU_BASH_DIR path=/opt/miaou-bash readonly=true | grep -q 'Device MIAOU-BASH added'
}
function infocmp_xterm_ghostty {
! command -v ghostty >/dev/null && return
local target="$1"
local optional_project=${2:-}
[[ -n $optional_project ]] && optional_project="--project $optional_project"
echo "export GHOSTTY infocmp from host to container"
infocmp -x xterm-ghostty | incus exec $optional_project $target -- tic -x - 2>/dev/null
}
function assign_host_zoneinfo {
local target="$1"
local optional_project=${2:-}
@ -113,12 +102,19 @@ function refresh_template {
if incus --project "$PROJECT_SANDBOX" info "$TEMPLATE_SANDBOX" | grep '^Status: STOPPED'; then
incus --project "$PROJECT_SANDBOX" start "$TEMPLATE_SANDBOX"
fi
incus --project "$PROJECT_SANDBOX" exec "$TEMPLATE_SANDBOX" -- bash <<EOF
script=$(
cat <<-EOF
apt-get update
apt-get dist-upgrade -y
apt-get install -y curl
/opt/miaou-bash/install.sh
MIAOU_BASH_DIR=/opt/miaou-bash
export MIAOU_BASH_DIR
"\$MIAOU_BASH_DIR"/bin/miaou-bash "\$MIAOU_BASH_DIR"/lib/init.bash
EOF
)
incus --project "$PROJECT_SANDBOX" exec "$TEMPLATE_SANDBOX" -- bash -c "$script"
incus --project "$PROJECT_SANDBOX" stop "$TEMPLATE_SANDBOX"
local image_date
@ -138,7 +134,6 @@ LLMNR=no
DNSStubListener=no
EOF
mount_miaou_bash "$TEMPLATE_SANDBOX" "$PROJECT_SANDBOX"
command -v ghostty >/dev/null && infocmp_xterm_ghostty "$TEMPLATE_SANDBOX" "$PROJECT_SANDBOX"
refresh_template
echo "template:"$TEMPLATE_SANDBOX" from project:$PROJECT_SANDBOX built successfully!"
}

6
tools/miaou-destroy

@ -1,4 +1,4 @@
#!/usr/bin/env bash
#!/usr/bin/env miaou-bash
# CONSTANTS
@ -56,10 +56,8 @@ function destroy {
# MAIN
set -Eueo pipefail
# shellcheck source=/opt/miaou-bash/lib/functions.bash
source "$MIAOU_BASH_DIR/lib/functions.bash"
source "$MIAOU_BASH_DIR"/lib/functions.bash
_flatten_short_options ARGS
parse_options "${ARGS[@]}"

3
tools/miaou-exec

@ -1,4 +1,4 @@
#!/usr/bin/env bash
#!/usr/bin/env miaou-bash
# CONSTANTS
@ -52,6 +52,5 @@ function exec {
# MAIN
set -Eue
parse_options "$@"
exec

2
tools/miaou-ls

@ -1,4 +1,4 @@
#!/usr/bin/env bash
#!/usr/bin/env miaou-bash
# CONSTANTS

3
tools/miaou-pull

@ -1,4 +1,4 @@
#!/usr/bin/env bash
#!/usr/bin/env miaou-bash
# CONSTANTS
@ -49,7 +49,6 @@ function copy {
# MAIN
set -Eue
parse_options $*
normalize_source_file
copy

5
tools/miaou-push

@ -1,4 +1,4 @@
#!/usr/bin/env bash
#!/usr/bin/env miaou-bash
# CONSTANTS
@ -44,6 +44,5 @@ function copy {
# MAIN
set -Eue
parse_options $*
parse_options "$@"
copy

2
tools/miaou-recipe

@ -1,4 +1,4 @@
#!/usr/bin/env bash
#!/usr/bin/env miaou-bash
# CONSTANTS

4
tools/miaou-start

@ -1,8 +1,7 @@
#!/usr/bin/env bash
#!/usr/bin/env miaou-bash
# CONSTANTS
BASEDIR=$(dirname "$0")
CONTAINERS=()
USER=
@ -38,6 +37,5 @@ function start {
# MAIN
set -Eue
parse_options $*
start

6
tools/miaou-stop

@ -1,8 +1,7 @@
#!/usr/bin/env bash
#!/usr/bin/env miaou-bash
# CONSTANTS
BASEDIR=$(dirname "$0")
CONTAINERS=()
# FUNCTIONS
@ -37,6 +36,5 @@ function stop {
# MAIN
set -Eue
parse_options $*
parse_options "$@"
stop
Loading…
Cancel
Save