Skip to content

Commit

Permalink
Merge pull request #360 from WhitewaterFoundry/development
Browse files Browse the repository at this point in the history
Development
  • Loading branch information
crramirez authored Jan 19, 2022
2 parents a9c9689 + 70270e0 commit d2f94da
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 13 deletions.
12 changes: 8 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
version: 2.1
parameters:
package-version:
type: string
default: "1.0"

jobs:
shellcheck:
Expand Down Expand Up @@ -31,7 +35,7 @@ jobs:
name: Update changelog
command: |
rm ./debian/changelog
dch --create --distribution bullseye --package "pengwin-setup" --newversion 0.1-${CIRCLE_BUILD_NUM} "Built on Circle CI"
dch --create --distribution bullseye --package "pengwin-setup" --newversion << pipeline.parameters.package-version >>-${CIRCLE_BUILD_NUM} "Built on Circle CI"
- run:
name: Build the package
command: debuild -i -us -uc -b
Expand All @@ -40,7 +44,7 @@ jobs:
command: mkdir -p /tmp/pkgs
- run:
name: Copy package to workspace
command: cp ../pengwin-setup_0.1-${CIRCLE_BUILD_NUM}_all.deb /tmp/pkgs
command: cp ../pengwin-setup_<< pipeline.parameters.package-version >>-${CIRCLE_BUILD_NUM}_all.deb /tmp/pkgs
- persist_to_workspace:
root: /tmp/pkgs
paths: [ . ]
Expand Down Expand Up @@ -96,7 +100,7 @@ jobs:
command: gem install package_cloud
- run:
name: Push deb package bullseye
command: package_cloud push whitewaterfoundry/pengwin-setup/debian/bullseye /tmp/pkgs/pengwin-setup_0.1-*_all.deb
command: package_cloud push whitewaterfoundry/pengwin-setup/debian/bullseye /tmp/pkgs/pengwin-setup_<< pipeline.parameters.package-version >>-*_all.deb
deploydevdeb:
docker:
- image: circleci/ruby:2.3-jessie
Expand All @@ -109,7 +113,7 @@ jobs:
command: gem install package_cloud
- run:
name: Push deb package bullseye
command: package_cloud push whitewaterfoundry/pengwin-setup-dev/debian/bullseye /tmp/pkgs/pengwin-setup_0.1-*_all.deb
command: package_cloud push whitewaterfoundry/pengwin-setup-dev/debian/bullseye /tmp/pkgs/pengwin-setup_<< pipeline.parameters.package-version >>-*_all.deb
workflows:
version: 2
testdebbuild:
Expand Down
7 changes: 3 additions & 4 deletions debian/copyright
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ Upstream-Name: pengwin-setup
Source: https://github.com/WhitewaterFoundry/pengwin-setup

Files: *
Copyright: 2019 Whitewater Foundry, Ltd. Co.
License: Expat
Copyright: 2022 Whitewater Foundry, Ltd. Co.
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:
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.
Expand All @@ -22,4 +22,3 @@ License: Expat
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.

4 changes: 3 additions & 1 deletion pengwin-setup.d/java.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@ EOF

curl https://raw.githubusercontent.com/Bash-it/bash-it/master/completion/available/sdkman.completion.bash | sudo tee /etc/bash_completion.d/sdkman.bash

message --title "SDKMan" --msgbox "To install Java use: \n\nsdk list java\n\nThen: \n\nsdk install java 'version'" 15 60
sdk install java

message --title "SDKMan" --msgbox "$(sdk c java)\n\nTo install other Java versions use: \n\nsdk list java\n\nThen: \n\nsdk install java 'version'" 17 60

touch "${HOME}"/.should-restart
else
Expand Down
5 changes: 3 additions & 2 deletions pengwin-setup.d/pythonpi.sh
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,9 @@ function install_poetry() {
echo "Installing POETRY"
createtmp
install_packages build-essential python3.9 python3.9-distutils idle-python3.9 python3-venv
curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | python3
source $HOME/.poetry/env
curl -sSL https://install.python-poetry.org | python3 -

source "${HOME}"/.poetry/env
poetry self update
poetry completions bash | sudo tee /usr/share/bash-completion/completions/poetry.bash-completion

Expand Down
2 changes: 1 addition & 1 deletion pengwin-setup.d/vcxsrv.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# shellcheck source=./common.sh
source "$(dirname "$0")/common.sh" "$@"

version="1.20.9.0"
version="1.20.14.0"

if (confirm --title "VCXSRV" --yesno "Would you like to install the VcXsrv X-server? This will be installed to your Windows home directory under .vcxsrv" 8 80); then
echo "Installing VcXsrv"
Expand Down
2 changes: 1 addition & 1 deletion pengwin-setup.d/x410.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ EOF
else
if (confirm --title "X410" --yesno "It seems that X410 is not installed on your machine. Would you like to view a link to X410 (recommended) on the Microsoft Store?" 10 80) then
echo "Running $ wslview <link>"
wslview https://afflnk.microsoft.com/c/1291904/433017/7593?u=https%3A%2F%2Fwww.microsoft.com%2Fen-us%2Fp%2Fx410%2F9nlp712zmn9q%23activetab%3Dpivot%3Aoverviewtab
wslview 'ms-windows-store://pdp/?PRODUCTID=9nlp712zmn9q&cid=pengwin-setup'
else
echo "Skipping X410"
fi
Expand Down

0 comments on commit d2f94da

Please sign in to comment.