4 Commits

Author SHA1 Message Date
92bd09a2c6 Add rpm and deb builds 2021-03-27 00:54:08 -04:00
68b03407e7 Resolve key issue 2021-03-27 00:07:32 -04:00
e2da267c47 Add title option 2021-03-26 23:55:54 -04:00
70a052d29c Update release configuration 2021-03-26 23:51:28 -04:00
5 changed files with 143 additions and 102 deletions

View File

@ -10,17 +10,30 @@ steps:
path: /build path: /build
commands: commands:
- mkdir -p /build - mkdir -p /build
- GOOS=linux GOARCH=386 go build -ldflags="-X 'cmd.Key=$API_KEY'" -o /build/pastee_linux_i386 - GOOS=linux GOARCH=386 go build -ldflags="-X 'paste.ee/cli/cmd.Key=$API_KEY'" -o /build/pastee_linux_i386
- GOOS=linux GOARCH=amd64 go build -ldflags="-X 'cmd.Key=$API_KEY'" -o /build/pastee_linux_amd64 - GOOS=linux GOARCH=amd64 go build -ldflags="-X 'paste.ee/cli/cmd.Key=$API_KEY'" -o /build/pastee_linux_amd64
- GOOS=linux GOARCH=arm GOARM=7 go build -ldflags="-X 'cmd.Key=$API_KEY'" -o /build/pastee_linux_armv7 - GOOS=linux GOARCH=arm GOARM=7 go build -ldflags="-X 'paste.ee/cli/cmd.Key=$API_KEY'" -o /build/pastee_linux_armv7
- GOOS=linux GOARCH=arm64 go build -ldflags="-X 'cmd.Key=$API_KEY'" -o /build/pastee_linux_arm64 - GOOS=linux GOARCH=arm64 go build -ldflags="-X 'paste.ee/cli/cmd.Key=$API_KEY'" -o /build/pastee_linux_arm64
- GOOS=windows GOARCH=386 go build -ldflags="-X 'cmd.Key=$API_KEY'" -o /build/pastee_windows_i386.exe - GOOS=windows GOARCH=386 go build -ldflags="-X 'paste.ee/cli/cmd.Key=$API_KEY'" -o /build/pastee_windows_i386.exe
- GOOS=windows GOARCH=amd64 go build -ldflags="-X 'cmd.Key=$API_KEY'" -o /build/pastee_windows_amd64.exe - GOOS=windows GOARCH=amd64 go build -ldflags="-X 'paste.ee/cli/cmd.Key=$API_KEY'" -o /build/pastee_windows_amd64.exe
- GOOS=darwin GOARCH=arm64 go build -ldflags="-X 'cmd.Key=$API_KEY'" -o /build/pastee_macos_arm64 - GOOS=darwin GOARCH=arm64 go build -ldflags="-X 'paste.ee/cli/cmd.Key=$API_KEY'" -o /build/pastee_macos_arm64
- GOOS=darwin GOARCH=amd64 go build -ldflags="-X 'cmd.Key=$API_KEY'" -o /build/pastee_macos_amd64 - GOOS=darwin GOARCH=amd64 go build -ldflags="-X 'paste.ee/cli/cmd.Key=$API_KEY'" -o /build/pastee_macos_amd64
environment: environment:
API_KEY: API_KEY:
from_secret: api_key from_secret: api_key
- name: package
image: tystuyfzand/fpm
commands:
- chmod +x scripts/build-package.sh
- ARCH=i386 scripts/build-package.sh
- ARCH=amd64 scripts/build-package.sh
- ARCH=armv7 scripts/build-package.sh
- ARCH=arm64 scripts/build-package.sh
volumes:
- name: build
path: /build
when:
event: tag
- name: release - name: release
image: plugins/gitea-release image: plugins/gitea-release
volumes: volumes:
@ -29,11 +42,19 @@ steps:
settings: settings:
api_key: api_key:
from_secret: gitea_token from_secret: gitea_token
gitea_server: https://git.meow.tf base_url: https://git.meow.tf
title: release
files: files:
- /build/pastee_* - /build/pastee_*
checksum:
- md5
- sha1
- sha256
environment: environment:
PLUGIN_API_KEY: PLUGIN_API_KEY:
from_secret: gitea_token from_secret: gitea_token
when: when:
event: tag event: tag
volumes:
- name: build
temp: {}

View File

@ -8,10 +8,6 @@ import (
"os" "os"
) )
const (
Key = ""
)
var rootCmd = &cobra.Command{ var rootCmd = &cobra.Command{
Use: "pastee", Use: "pastee",
Short: "A quick and easy to use Command-Line Paste Interface", Short: "A quick and easy to use Command-Line Paste Interface",
@ -22,6 +18,7 @@ var rootCmd = &cobra.Command{
var ( var (
cfgFile string cfgFile string
Key = ""
) )
func Execute() { func Execute() {
@ -34,13 +31,10 @@ func Execute() {
func init() { func init() {
cobra.OnInitialize(initConfig) cobra.OnInitialize(initConfig)
rootCmd.PersistentFlags().BoolP("encrypt", "e", true, "Encrypt uploaded contents") rootCmd.PersistentFlags().BoolP("encrypt", "e", false, "Encrypt uploaded contents")
rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default is $HOME/.cobra.yaml)") rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default is $HOME/.cobra.yaml)")
rootCmd.PersistentFlags().Bool("viper", true, "use Viper for configuration") rootCmd.PersistentFlags().Bool("viper", true, "use Viper for configuration")
viper.BindPFlag("author", rootCmd.PersistentFlags().Lookup("author")) viper.BindPFlag("encrypt", rootCmd.PersistentFlags().Lookup("encrypt"))
viper.BindPFlag("useViper", rootCmd.PersistentFlags().Lookup("viper"))
viper.SetDefault("author", "NAME HERE <EMAIL ADDRESS>")
viper.SetDefault("license", "apache")
viper.SetDefault("apiKey", Key) viper.SetDefault("apiKey", Key)
rootCmd.AddCommand(loginCmd) rootCmd.AddCommand(loginCmd)

View File

@ -1,6 +1,7 @@
package cmd package cmd
import ( import (
"errors"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/spf13/viper" "github.com/spf13/viper"
"io/ioutil" "io/ioutil"
@ -16,7 +17,9 @@ import (
func uploadCommandHandler(cmd *cobra.Command, args []string) { func uploadCommandHandler(cmd *cobra.Command, args []string) {
client := pastee.New(viper.GetString("apiKey")) client := pastee.New(viper.GetString("apiKey"))
paste := &pastee.Paste{} paste := &pastee.Paste{
Encrypted: viper.GetBool("encrypt"),
}
if len(args) > 0 && args[0] != "-" { if len(args) > 0 && args[0] != "-" {
paste.Sections = make([]*pastee.Section, int(math.Min(float64(len(args)), 10))) paste.Sections = make([]*pastee.Section, int(math.Min(float64(len(args)), 10)))
@ -55,10 +58,20 @@ func uploadCommandHandler(cmd *cobra.Command, args []string) {
res, err := client.Submit(paste) res, err := client.Submit(paste)
if err != nil { if err != nil || res.Link == "" {
if err == nil {
err = errors.New("unknown error")
}
cmd.PrintErrln("Unable to upload paste:", err) cmd.PrintErrln("Unable to upload paste:", err)
os.Exit(1) os.Exit(1)
} }
cmd.Println(res.Link) link := res.Link
if res.Key != "" {
link += "#" + res.Key
}
cmd.Println(link)
} }

BIN
pastee

Binary file not shown.

13
scripts/build-package.sh Normal file
View File

@ -0,0 +1,13 @@
fpm -s dir -t deb -p /build/pastee_${DRONE_TAG}_${ARCH}.deb \
-n ow-api -v $DRONE_TAG -a $ARCH \
--deb-priority optional --force \
--deb-compression bzip2 \
--description "Paste.ee CLI Tool" \
-m "Paste.ee <admin@paste.ee>" --vendor "Paste.ee" \
-a $ARCH /build/pastee_linux_${ARCH}=/usr/bin/pastee
fpm -s dir -t rpm -p /build/pastee_${DRONE_TAG}_${ARCH}.rpm \
-n ow-api -v $DRONE_TAG -a $ARCH \
--description "Paste.ee CLI Tool" \
-m "Paste.ee <admin@paste.ee>" --vendor "Paste.ee" \
-a $ARCH /build/pastee_linux_${ARCH}=/usr/bin/pastee