Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Get working on Ubuntu 20.4. #410

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Get working on Ubuntu 20.4. #410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e02b6b3
Get working on Ubuntu 20.4.
les-buchanan Nov 22, 2020
1470adc
Updated references to intuit/wasabit -> les-buchanan/wasabi.
les-buchanan Nov 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file added .gradle/6.5/fileHashes/fileHashes.lock
View file
Open in desktop
Empty file.
Empty file added .gradle/6.5/gc.properties
View file
Open in desktop
Empty file.
10 changes: 6 additions & 4 deletions bin/container.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,21 +57,23 @@ fromPom() {

beerMe() {
sleepTime=${1:-sleep_default}
cntr=0
cntr=3

echo -ne "${green}chill'ax ${reset}"

while (( cntr < ${sleepTime} )); do
while (($cntr < $sleepTime)); do
echo -ne "${green}\xF0\x9F\x8D\xBA ${reset}"
echo -ne "cntr: $cntr, sleepTime: $sleepTime"
sleep 3
cntr=$(($cntr + 3))
let cntr+=3
done

echo ""
}

start_docker() {
docker ps >/dev/null 2>&1
#docker ps >/dev/null 2>&1
docker ps 2>&1
[[ $? != 0 && "${WASABI_OS}" == "${WASABI_OSX}" ]] && open /Applications/Docker.app

while :; do
Expand Down
13 changes: 7 additions & 6 deletions bin/wasabi.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ beerMe() {
cntr=0

echo -ne "${green}chill'ax ${reset}"
echo "WTF"

while (( cntr < ${sleepTime} )); do
echo -ne "\xF0\x9F\x8D\xBA "
Expand Down Expand Up @@ -125,10 +126,10 @@ bootstrap() {
. /etc/lsb-release
DISTRO=$DISTRIB_ID
DISTROVER=$DISTRIB_RELEASE
if [ $DISTRO == "Ubuntu" ] && [ $DISTROVER == "16.04" ]; then
if [ $DISTRO == "Ubuntu" ]; then #&& [ $DISTROVER == "16.04" ]; then
echo "${green}Operating system Ubuntu 16.04${reset}"
else
echo "${red}Unsupported Linux distribution${reset}"
echo "${red}Unsupported Linux distribution - $DISTRO - $DISTROVER ${reset}"
exit 1
fi
fi
Expand All @@ -149,26 +150,26 @@ bootstrap() {
sudo apt-get install -y git-flow

#Install Nodejs
curl -sL https://deb.nodesource.com/setup_6.x | sudo -E bash -
curl -sL https://deb.nodesource.com/setup_10.x | sudo -E bash -
sudo apt-get install -y nodejs
sudo npm install -g bower
sudo npm install -g grunt-cli
sudo npm install -g yo

#Install compass
sudo apt-get install -y ruby
sudo apt-get install -y ruby-compass
sudo apt-get install -y compass-blueprint-plugin #ruby-compass

#Install docker
sudo apt-get install -y apt-transport-https ca-certificates
sudo apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D
sudo echo "deb https://apt.dockerproject.org/repo ubuntu-xenial main" > /tmp/docker.list
sudo echo "deb https://download.docker.com/linux/ubuntu xenial stable" > /tmp/docker.list
sudo cp /tmp/docker.list /etc/apt/sources.list.d/docker.list
sudo rm -rf /tmp/docker.list
sudo apt-get purge lxc-docker
sudo apt-get update
sudo apt-get install -y linux-image-extra-$(uname -r) linux-image-extra-virtual
sudo apt-get install -y docker-engine
sudo apt-get install -y docker-ce #docker-engine

sudo groupadd docker
sudo usermod -aG docker $USER
Expand Down
13 changes: 1 addition & 12 deletions modules/ui/app/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,18 +106,7 @@ <h1></h1>
<script src="bower_components/angular-bootstrap/ui-bootstrap-tpls.js"></script>
<script src="bower_components/angular-ui-router/release/angular-ui-router.js"></script>
<script src="bower_components/jquery-ui/jquery-ui.js"></script>
<script src="bower_components/bootstrap-sass-official/vendor/assets/javascripts/bootstrap/affix.js"></script>
<script src="bower_components/bootstrap-sass-official/vendor/assets/javascripts/bootstrap/alert.js"></script>
<script src="bower_components/bootstrap-sass-official/vendor/assets/javascripts/bootstrap/button.js"></script>
<script src="bower_components/bootstrap-sass-official/vendor/assets/javascripts/bootstrap/carousel.js"></script>
<script src="bower_components/bootstrap-sass-official/vendor/assets/javascripts/bootstrap/collapse.js"></script>
<script src="bower_components/bootstrap-sass-official/vendor/assets/javascripts/bootstrap/dropdown.js"></script>
<script src="bower_components/bootstrap-sass-official/vendor/assets/javascripts/bootstrap/tab.js"></script>
<script src="bower_components/bootstrap-sass-official/vendor/assets/javascripts/bootstrap/transition.js"></script>
<script src="bower_components/bootstrap-sass-official/vendor/assets/javascripts/bootstrap/scrollspy.js"></script>
<script src="bower_components/bootstrap-sass-official/vendor/assets/javascripts/bootstrap/modal.js"></script>
<script src="bower_components/bootstrap-sass-official/vendor/assets/javascripts/bootstrap/tooltip.js"></script>
<script src="bower_components/bootstrap-sass-official/vendor/assets/javascripts/bootstrap/popover.js"></script>
<script src="bower_components/bootstrap-sass-official/vendor/assets/javascripts/bootstrap.js"></script>
<script src="bower_components/moment/moment.js"></script>
<script src="bower_components/ng-tags-input/ng-tags-input.js"></script>
<script src="bower_components/angular-spinner/dist/angular-spinner.min.js"></script>
Expand Down
Loading