Skip to content

Commit

Permalink
Merge pull request #2 from marcelGoerentz/beta_update
Browse files Browse the repository at this point in the history
Beta update
  • Loading branch information
marcelGoerentz authored Jun 19, 2024
2 parents 7c47070 + f3e33d3 commit 7cf1a79
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 21 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
name: Threadfin Build
on:
push:
branches:
- main
tags: "1.*"
tags:
- 'v*'

permissions:
contents: write
jobs:
build:
name: Build
runs-on: ubuntu-latest
if: github.ref == 'refs/heads/master'
steps:
- name: Check out code into the Go module directory
uses: actions/checkout@v4
Expand Down Expand Up @@ -58,7 +59,6 @@ jobs:
- name: Create a Release
uses: softprops/action-gh-release@v2
with:
token: ${{ secrets.GITHUB_TOKEN }}
prerelease: true
name: Development Build
tag_name: latest-beta
repo_token: "${{ secrets.GITHUB_TOKEN }}"
files: dist/*
make_latest: true
3 changes: 1 addition & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,8 @@ WORKDIR $THREADFIN_HOME
RUN rm /var/lib/dpkg/info/libc-bin.*
RUN apt-get clean
RUN apt-get update
RUN apt-get install libc-bin
RUN apt-get update && apt-get upgrade -y
RUN apt-get install -y ca-certificates curl ffmpeg vlc
RUN apt-get install -y libc-bin ca-certificates curl ffmpeg vlc

RUN DEBIAN_FRONTEND=noninteractive TZ="America/New_York" apt-get -y install tzdata

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ You can follow the old xTeVe documentation for now until I update it for Threadf
version: "2.3"
services:
threadfin:
image: fyb3roptik/threadfin
image: mgoerentz/threadfin
container_name: threadfin
ports:
- 34400:34400
Expand Down
13 changes: 6 additions & 7 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
module threadfin

go 1.18
go 1.22

require (
github.com/avfs/avfs v0.30.0
github.com/gorilla/websocket v1.5.0
github.com/hashicorp/go-version v1.6.0
github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0
github.com/koron/go-ssdp v0.0.3
golang.org/x/text v0.3.7
github.com/hashicorp/go-version v1.7.0
github.com/koron/go-ssdp v0.0.4
golang.org/x/text v0.16.0
)

require (
golang.org/x/net v0.0.0-20220517181318-183a9ca12b87 // indirect
golang.org/x/sys v0.0.0-20220519141025-dcacdad47464 // indirect
golang.org/x/net v0.26.0 // indirect
golang.org/x/sys v0.21.0 // indirect
)
6 changes: 2 additions & 4 deletions src/internal/up2date/client/update.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ import (
"runtime"
"strings"
"syscall"

"github.com/kardianos/osext"
)

// DoUpdate : Update binary
Expand Down Expand Up @@ -50,7 +48,7 @@ func DoUpdate(fileType, filenameBIN string) (err error) {
}

// Change binary filename to .filename
binary, err := osext.Executable()
binary, err := os.Executable()
var filename = getFilenameFromPath(binary)
var path = getPlatformPath(binary)
var oldBinary = path + "_old_" + filename
Expand Down Expand Up @@ -150,7 +148,7 @@ func DoUpdate(fileType, filenameBIN string) (err error) {
} else {

// Restart binary (Linux and UNIX)
file, _ := osext.Executable()
file, _ := os.Executable()
os.RemoveAll(oldBinary)
err = syscall.Exec(file, os.Args, os.Environ())
if err != nil {
Expand Down

0 comments on commit 7cf1a79

Please sign in to comment.