Update builds

.gitlab-ci.yml

-## Partially based off https://github.com/blndev/poc-rpm-build/blob/master/.gitlab-ci.yml
 
 stages:
   - test
-  - build-deb
+  - package
 
 test:
   stage: test
@@ -23,25 +22,40 @@ test:
     - supload -V supload.sh
     - supload -Vf supload.sh
 
-build-deb:
-  stage: build-deb
+#build-deb:
+#  stage: build-deb
+#  tags:
+#    - bash
+#  script:
+#    - ./ci/debian/create-deb.sh
+#  artifacts:
+#    name: "supload-$CI_COMMIT_REF_NAME-Build_$CI_JOB_ID"
+#    paths: [./*.deb]
+
+package:linux:deb:
+  stage: package
+  image: cdrx/fpm-debian:latest
   tags:
-    - bash
+    - docker
   script:
-    - ./ci/debian/create-deb.sh
+    - fpm -s dir -t deb -n supload -a all --description "SUpload is an easy to use script for taking screenshots and uploading files to a curl supported file host. Supports SFW and NSFW modes, perfect for shitposting, AND for work!" --license MIT -d bash -d curl -d jq --deb-recommends maim --deb-suggests xclip --deb-suggests libnotify-bin -m "Volkor The Barbarian Warrior <volkor@thecum.zone>" --config-files /etc/supload.conf -v $CI_COMMIT_REF_NAME supload.sh=/usr/local/bin/supload supload.conf=/etc/supload.conf
   artifacts:
-    name: "supload-$CI_COMMIT_REF_NAME-Build_$CI_JOB_ID"
-    paths: [./*.deb]
+    name: supload_${CI_COMMIT_REF_NAME}
+    paths:
+      - ./*.deb
+#  only:
+#    - tags
 
-#build-rpm:
-#  stage: build-rpm
-#  image: blndev/rpmbuild
-#  script:
-#    - make rpm
-  #only:
-  #  - tags
-  #except:
-  #  - branches
-#  artifacts:
-#    name: "rpm-$CI_COMMIT_REF_NAME-Build_$CI_JOB_ID"
-#    paths: [dist/**]
+package:linux:rpm:
+  stage: package
+  image: cdrx/fpm-centos:latest
+  tags:
+    - docker
+  script:
+    - fpm -s dir -t rpm -n supload -a all --description "SUpload is an easy to use script for taking screenshots and uploading files to a curl supported file host. Supports SFW and NSFW modes, perfect for shitposting, AND for work!" --license MIT -d bash -d curl -d jq -d maim -d libnotify -m "Volkor The Barbarian Warrior <volkor@thecum.zone>" --config-files /etc/supload.conf -v $CI_COMMIT_REF_NAME supload.sh=/usr/local/bin/supload supload.conf=/etc/supload.conf
+  artifacts:
+    name: supload_${CI_COMMIT_REF_NAME}
+    paths:
+      - ./*.rpm
+#  only:
\ No newline at end of file
+#    - tags
\ No newline at end of file

ci/debian/changelog

-supload (1.0.0) unstable; urgency=medium
-
-  * Initial release (Partial: Milestone #2)
-
- -- Volkor The Barbarian Warrior <volkor@thecum.zone>  Thu, 27 Sep 2018 22:12:04 +1000

ci/debian/control

-Source: supload
-Maintainer: Volkor The Barbarian Warrior <volkor@thecum.zone>
-Homepage: https://git.thecum.zone/Volkor/SUpload
-Standards-Version: 4.2.1
-Section: utils
-
-Package: supload
-Architecture: all
-Depends: bash, curl, jq
-Recommends: xclip, maim, libnotify-bin
-Priority: optional
-Description: SUpload - Simple file uploader
- SUpload is an easy to use script for taking screenshots and uploading files to a curl supported file host.
- Supports SFW and NSFW modes, perfect for shitposting, AND for work!
-Tag: admin::file-distribution, implemented-in::shell, 
- interface::commandline, works-with::file, network::client, protocol::http, role::program
\ No newline at end of file

ci/debian/copyright

-Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: supload
-Source: https://git.thecum.zone/Volkor/SUpload
-
-Files: debian/*
-Copyright: 2018 Volkor The Barbarian Warrior <volkor@thecum.zone>
-License: Expat
-
-License: Expat
- Permission is hereby granted, free of charge, to any person obtaining a
- copy of this software and associated documentation files (the "Software"),
- to deal in the Software without restriction, including without limitation
- the rights to use, copy, modify, merge, publish, distribute, sublicense,
- and/or sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following conditions:
- .
- The above copyright notice and this permission notice shall be included
- in all copies or substantial portions of the Software.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, 
- TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 
- SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-

ci/debian/create-deb.sh

-#!/bin/bash
-
-#env var
-DEBFULLNAME="Volkor The Barbarian Warrior"
-USER="Volkor"
-
-# install dependencies (this should be already done on the shell runner in gitlab though)
-echo "Installing dependencies: This might take a while"
-apt-get update > /dev/null && apt-get install -y build-essential dh-make devscripts apt-utils  > /dev/null
-
-VERSION="1.0"
-
-FOLDER="supload-$VERSION"
-
-mkdir $FOLDER
-
-# Copy files needed for packaging
-cp supload.conf $FOLDER/supload.conf
-cp supload.sh $FOLDER/supload
-cd $FOLDER
-
-# Generate empty package
-dh_make --indep --createorig -c mit -e volkor@thecum.zone --yes
-
-# move more files needed for packaging
-cp ../ci/debian/control debian/control || exit 1
-cp ../ci/debian/copyright debian/copyright || exit 1
-cp ../ci/debian/changelog debian/changelog || exit 1
-
-# Remove make calls
-grep -v makefile debian/rules > debian/rules.new
-mv debian/rules.new debian/rules
-
-# add supload.sh to debian installer
-echo supload usr/bin/ > debian/install
-echo supload.conf etc/ >> debian/install
-
-# Remove the example files
-rm debian/*.ex
-rm debian/*.EX
-rm debian/README.Debian
-rm debian/README.source
-
-debuild -i -us -uc -b 
-
-echo CI_COMMIT_MESSAGE
\ No newline at end of file