From 043a6388ad55e610644217958158f88610422184 Mon Sep 17 00:00:00 2001 From: mayumi Date: Fri, 3 Oct 2025 17:43:49 +0900 Subject: [PATCH 1/3] =?UTF-8?q?refactor(scripts):=20=E3=82=AF=E3=83=AA?= =?UTF-8?q?=E3=83=BC=E3=83=B3=E3=82=A2=E3=83=83=E3=83=97=E3=82=B9=E3=82=AF?= =?UTF-8?q?=E3=83=AA=E3=83=97=E3=83=88=E3=81=AE=E5=A4=89=E6=95=B0=E3=82=92?= =?UTF-8?q?'CASSETTE'=E3=81=AB=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit サービスのクリーンアップ用シェルスクリプト内で使用されていた、古いプレフィックスの変数をに修正しました。 --- .../message-bus/arch/cleanup-message-bus.sh | 20 +++++++++---------- .../message-bus/debian/cleanup-message-bus.sh | 20 +++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/build/sysroot/usr/share/cassetteos/cleanup/service.d/message-bus/arch/cleanup-message-bus.sh b/build/sysroot/usr/share/cassetteos/cleanup/service.d/message-bus/arch/cleanup-message-bus.sh index e242713..4cd93c6 100644 --- a/build/sysroot/usr/share/cassetteos/cleanup/service.d/message-bus/arch/cleanup-message-bus.sh +++ b/build/sysroot/usr/share/cassetteos/cleanup/service.d/message-bus/arch/cleanup-message-bus.sh @@ -2,13 +2,13 @@ set -e -readonly CASA_SERVICES=( +readonly CASSETTE_SERVICES=( "cassetteos-message-bus.service" ) -readonly CASA_EXEC=cassetteos-message-bus -readonly CASA_CONF=/etc/cassetteos/message-bus.conf -readonly CASA_DB=/var/lib/cassetteos/db/message-bus.db +readonly CASSETTE_EXEC=cassetteos-message-bus +readonly CASSETTE_CONF=/etc/cassetteos/message-bus.conf +readonly CASSETTE_DB=/var/lib/cassetteos/db/message-bus.db readonly aCOLOUR=( '\e[38;5;154m' # green | Lines, bullets and separators @@ -44,8 +44,8 @@ onCtrlC() { exit 1 } -if [[ ! -x "$(command -v ${CASA_EXEC})" ]]; then - Show 2 "${CASA_EXEC} is not detected, exit the script." +if [[ ! -x "$(command -v ${CASSETTE_EXEC})" ]]; then + Show 2 "${CASSETTE_EXEC} is not detected, exit the script." exit 1 fi @@ -67,14 +67,14 @@ while true; do esac done -for SERVICE in "${CASA_SERVICES[@]}"; do +for SERVICE in "${CASSETTE_SERVICES[@]}"; do Show 2 "Stopping ${SERVICE}..." systemctl disable --now "${SERVICE}" || Show 3 "Failed to disable ${SERVICE}" done -rm -rvf "$(which ${CASA_EXEC})" || Show 3 "Failed to remove ${CASA_EXEC}" -rm -rvf "${CASA_CONF}" || Show 3 "Failed to remove ${CASA_CONF}" +rm -rvf "$(which ${CASSETTE_EXEC})" || Show 3 "Failed to remove ${CASSETTE_EXEC}" +rm -rvf "${CASSETTE_CONF}" || Show 3 "Failed to remove ${CASSETTE_CONF}" if [[ ${REMOVE_LOCAL_STORAGE_DATABASE} == true ]]; then - rm -rvf "${CASA_DB}" || Show 3 "Failed to remove ${CASA_DB}" + rm -rvf "${CASSETTE_DB}" || Show 3 "Failed to remove ${CASSETTE_DB}" fi diff --git a/build/sysroot/usr/share/cassetteos/cleanup/service.d/message-bus/debian/cleanup-message-bus.sh b/build/sysroot/usr/share/cassetteos/cleanup/service.d/message-bus/debian/cleanup-message-bus.sh index 6c9ac21..4cd93c6 100644 --- a/build/sysroot/usr/share/cassetteos/cleanup/service.d/message-bus/debian/cleanup-message-bus.sh +++ b/build/sysroot/usr/share/cassetteos/cleanup/service.d/message-bus/debian/cleanup-message-bus.sh @@ -2,13 +2,13 @@ set -e -readonly CASA_SERVICES=( +readonly CASSETTE_SERVICES=( "cassetteos-message-bus.service" ) -readonly CASA_EXEC=cassetos-message-bus -readonly CASA_CONF=/etc/cassetteos/message-bus.conf -readonly CASA_DB=/var/lib/cassetteos/db/message-bus.db +readonly CASSETTE_EXEC=cassetteos-message-bus +readonly CASSETTE_CONF=/etc/cassetteos/message-bus.conf +readonly CASSETTE_DB=/var/lib/cassetteos/db/message-bus.db readonly aCOLOUR=( '\e[38;5;154m' # green | Lines, bullets and separators @@ -44,8 +44,8 @@ onCtrlC() { exit 1 } -if [[ ! -x "$(command -v ${CASA_EXEC})" ]]; then - Show 2 "${CASA_EXEC} is not detected, exit the script." +if [[ ! -x "$(command -v ${CASSETTE_EXEC})" ]]; then + Show 2 "${CASSETTE_EXEC} is not detected, exit the script." exit 1 fi @@ -67,14 +67,14 @@ while true; do esac done -for SERVICE in "${CASA_SERVICES[@]}"; do +for SERVICE in "${CASSETTE_SERVICES[@]}"; do Show 2 "Stopping ${SERVICE}..." systemctl disable --now "${SERVICE}" || Show 3 "Failed to disable ${SERVICE}" done -rm -rvf "$(which ${CASA_EXEC})" || Show 3 "Failed to remove ${CASA_EXEC}" -rm -rvf "${CASA_CONF}" || Show 3 "Failed to remove ${CASA_CONF}" +rm -rvf "$(which ${CASSETTE_EXEC})" || Show 3 "Failed to remove ${CASSETTE_EXEC}" +rm -rvf "${CASSETTE_CONF}" || Show 3 "Failed to remove ${CASSETTE_CONF}" if [[ ${REMOVE_LOCAL_STORAGE_DATABASE} == true ]]; then - rm -rvf "${CASA_DB}" || Show 3 "Failed to remove ${CASA_DB}" + rm -rvf "${CASSETTE_DB}" || Show 3 "Failed to remove ${CASSETTE_DB}" fi From 0dc7fc1e6110635e24e6bb84aab3fbed3154ea6b Mon Sep 17 00:00:00 2001 From: mayumi Date: Mon, 20 Oct 2025 16:39:14 +0900 Subject: [PATCH 2/3] chore: versionup --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index d96122c..7ace56e 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.21 toolchain go1.21.7 require ( - github.com/BeesNestInc/CassetteOS-Common v0.0.10 + github.com/BeesNestInc/CassetteOS-Common v0.0.11 github.com/CorrectRoadH/go-socket.io v1.8.0-rc.5 github.com/glebarez/sqlite v1.7.0 github.com/gobwas/ws v1.1.0 diff --git a/go.sum b/go.sum index 7d6b33b..85a39b4 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -github.com/BeesNestInc/CassetteOS-Common v0.0.10 h1:UoZUZszHqlTtkYHO5R00MyscqzRfVNMi9voIsVWrRWM= -github.com/BeesNestInc/CassetteOS-Common v0.0.10/go.mod h1:widQKlAywDFAdxMiSJr5t1bXU7GE9PI2cVPP1JPGCxo= +github.com/BeesNestInc/CassetteOS-Common v0.0.11 h1:YmKmJnoyS6BDfFMshd86IJI44iN1gFViP/2EJq+S3Zo= +github.com/BeesNestInc/CassetteOS-Common v0.0.11/go.mod h1:DGaVmEbHt/Nv5ik1c0kYq/30+Ib+EWv6KqYzSnP5ABQ= github.com/CorrectRoadH/go-socket.io v1.8.0-rc.5 h1:cjlXtmuOug5168+XRM+7iJxbd9lLkL9AgzemF7ZqoPI= github.com/CorrectRoadH/go-socket.io v1.8.0-rc.5/go.mod h1:DgupkgFQg7/js8Tr1uLYICJRGlHmKWIV6hWWTH2V2fc= github.com/RaveNoX/go-jsoncommentstrip v1.0.0/go.mod h1:78ihd09MekBnJnxpICcwzCMzGrKSKYe4AqU6PDYYpjk= From 1bc4e6fc600b1948dcb55efbed9de145c1309b92 Mon Sep 17 00:00:00 2001 From: mayumi Date: Mon, 20 Oct 2025 16:39:57 +0900 Subject: [PATCH 3/3] chore: v0.0.11 --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d1fa316..46f526f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ - 他リポジトリとのバージョン整合のためバージョンを更新しました - このバージョンではコードの変更はありません +## v0.0.11 +- クリーンアップスクリプトのリネーム + ## v0.0.10 - 他リポジトリとのバージョン整合のためバージョンを更新しました - このバージョンではコードの変更はありません