i fixed the build now wooooo

2 files changed, 28 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 320033b13240..1214997bad0d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,20 @@
 pkgbase = extraterm-git
 	pkgdesc = The swiss army chainsaw of terminal emulators.
-	pkgver = v0.33.1.r49.gd07488b
+	pkgver = 0.38.0.r41.ge69cf935
 	pkgrel = 1
 	url = https://github.com/sedwards2009/extraterm
 	arch = i686
 	arch = x86_64
 	license = MIT
-	depends = nodejs
-	conflicts = extraterm
-	source = git+https://github.com/sedwards2009/extraterm#branch=dev
+	makedepends = openssh
+	makedepends = python2
+	makedepends = git
+	makedepends = npm
+	makedepends = yarn
+	makedepends = nodejs-lts-carbon
+	makedepends = typescript
+	conflicts = extraterm-bin
+	source = git+https://github.com/sedwards2009/extraterm
 	sha512sums = SKIP
 
 pkgname = extraterm-git
diff --git a/PKGBUILD b/PKGBUILD
index 18e1fea7395d..af99be6c9620 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,55 +1,48 @@
   # Maintainer:  solaraquarion <shlomochoina@gmial.com>
 pkgname=extraterm-git
 _pkgname=extraterm
-_pkgver=0.33.1
-pkgver=v0.33.1.r49.gd07488b
+_pkgver=0.39.0
+pkgver=0.38.0.r41.ge69cf935
 pkgrel=1
-conflicts=('extraterm')
+conflicts=('extraterm-bin')
 pkgdesc="The swiss army chainsaw of terminal emulators."
 arch=("i686" "x86_64")
 url="https://github.com/sedwards2009/extraterm"
 license=("MIT")
-depends=("nodejs")
-_branch=dev
-source=(git+$url#branch=$_branch)
+#depends=("nodejs")
+makedepends=('openssh' 'python2' 'git' 'npm' 'yarn' 'nodejs-lts-carbon' 'typescript')
+source=(git+$url)
 sha512sums=('SKIP')
 
 pkgver() {
   cd "$_pkgname"
-  git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+  git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 build() {
  cd $srcdir/$_pkgname
-
- yarn install 
- yarn run build
- yarn run package
+ yarn install
+ yarn run package-linux-zip-only
 }
 package() {
   cd $srcdir/$_pkgname
-
-  msg2 "  -> Installing program..."
-
-  install -d $pkgdir/opt
-  install -d $pkgdir/opt/$_pkgname
+  
+  install -d $pkgdir/usr/lib
+  install -d $pkgdir/usr/lib/$_pkgname
 
   install -d $pkgdir/usr/bin
-  cp -r "$srcdir/$_pkgname"/build_tmp/extraterm-$_pkgver-linux-x64/* "$pkgdir/opt/$_pkgname"
+  cp -r "$srcdir/$_pkgname"/build_tmp/extraterm-$_pkgver-linux-x64/* "$pkgdir/usr/lib/$_pkgname"
 
    install -Dm755 /dev/stdin "$pkgdir"/usr/bin/$_pkgname <<END
      #!/usr/bin/bash
-    /opt/extraterm/extraterm
+    /usr/lib/extraterm/extraterm
 END
 
-  msg2 "  -> Installing icons..."
   local _icon_dir="usr/share/icons/hicolor"
-  install -Dm644 $pkgdir/opt/$_pkgname/resources/app/extraterm/resources/logo/extraterm_main_logo.svg $pkgdir/$_icon_dir/scalable/apps/$_pkgname.svg
+  install -Dm644 $pkgdir/usr/lib/$_pkgname/resources/app/extraterm/resources/logo/extraterm_main_logo.svg $pkgdir/$_icon_dir/scalable/apps/$_pkgname.svg
 
-   install -Dm644 $pkgdir/opt/$_pkgname/resources/app/extraterm/resources/logo/extraterm_small_logo_256x256.png  $pkgdir/$_icon_dir/256x256/apps/$_pkgname.png
+   install -Dm644 $pkgdir/usr/lib/$_pkgname/resources/app/extraterm/resources/logo/extraterm_small_logo_256x256.png  $pkgdir/$_icon_dir/256x256/apps/$_pkgname.png
 
-  msg2 "  -> Installing .desktop file..."
-  install -Dm644 $pkgdir/opt/$_pkgname/resources/app/extraterm/resources/extraterm.desktop $pkgdir/usr/share/applications/extraterm.desktop
+  install -Dm644 $pkgdir/usr/lib/$_pkgname/resources/app/extraterm/resources/extraterm.desktop $pkgdir/usr/share/applications/extraterm.desktop
 
-  msg2 "  -> Installing license..."
-  install -Dm755 $pkgdir/opt/$_pkgname/LICENSE.txt $pkgdir/usr/share/licenses/$_pkgname/copyright
+  install -Dm755 $pkgdir/usr/lib/$_pkgname/LICENSE.txt $pkgdir/usr/share/licenses/$_pkgname/copyright
 }