diff --git a/build.android.sh b/build.android.sh index c9c3cbe..cae6d93 100644 --- a/build.android.sh +++ b/build.android.sh @@ -3,12 +3,15 @@ #go get github.com/ffdfgdfg/fyne-cross #fyne-cross --targets=linux/amd64,windows/amd64,darwin/amd64 gui/npc/npc.go +mkdir -p /go/src/github.com/cnlh/nps +cp -R * /go/src/github.com/cnlh/nps +cd /go/src/github.com/cnlh/nps go get -u fyne.io/fyne fyne.io/fyne/cmd/fyne go mod vendor cd vendor -cp -R * /go/src/ +cp -R * /go/src cd .. rm -rf vendor cd gui/npc fyne package -os android -appID org.nps.client -icon ../../docs/logo.png -mv npc.apk ../../android_client.apk +mv npc.apk /app/android_client.apk diff --git a/build.sh b/build.sh index 2babfba..56e77f9 100755 --- a/build.sh +++ b/build.sh @@ -163,7 +163,7 @@ sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubun sudo apt-get update sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce docker --version -docker run --rm -i -w /app -v $(pwd):/app -e ANDROID_HOME=/usr/local/android_sdk ffdfgdfg/fyne-cross:android build.android.sh +docker run --rm -i -w /app -v $(pwd):/app -e ANDROID_HOME=/usr/local/android_sdk ffdfgdfg/fyne-cross:android /app/build.android.sh git clone https://github.com/cnlh/spksrc.git ~/spksrc mkdir ~/spksrc/nps && cp -rf ./* ~/spksrc/nps/ docker run -itd --name spksrc --env VERSION=$VERSION -v ~/spksrc:/spksrc synocommunity/spksrc /bin/bash