From ad34d5c64a160873c5416a24d8d8205bb9e55e14 Mon Sep 17 00:00:00 2001 From: AnthonyAxenov Date: Mon, 4 Jul 2022 17:56:45 +0800 Subject: [PATCH] Makefile instead of start.sh + generator --- .gitignore | 1 + Makefile | 112 ++++++++++++++++-- README.md | 73 ++++++------ gen-makefile.sh | 30 +++++ install/{700-apache.sh => apache.sh} | 2 + install/{000-apt.sh => apt.sh} | 2 + install/{120-chrome.sh => chrome.sh} | 2 + install/{720-composer.sh => composer.sh} | 4 +- install/{020-docker.sh => docker.sh} | 4 +- install/droidcam-obs.sh | 2 + install/droidcam.sh | 4 +- install/{010-git.sh => git.sh} | 7 +- install/{200-golang.sh => golang.sh} | 1 + install/{100-grub-customizer.sh => grubc.sh} | 4 +- .../{500-kde-appmenu.sh => kde-appmenu.sh} | 4 +- install/{160-lite-xl.sh => lite-xl.sh} | 4 +- install/{800-mariadb.sh => mariadb.sh} | 4 +- install/{997-nodejs.sh => nodejs.sh} | 2 + install/{810-pgsql.sh => pgsql.sh} | 6 +- install/{710-php.sh => php.sh} | 4 +- install/{130-postman.sh => postman.sh} | 2 + install/{150-rustdesk.sh => rustdesk.sh} | 8 +- install/{001-snap.sh => snap.sh} | 22 ++-- install/{050-syncthing.sh => syncthing.sh} | 4 +- install/{140-telebit.sh => telebit.sh} | 4 +- install/{002-flatpak.sh => todo/flatpak.sh_} | 0 install/{730-oci8.sh_ => todo/oci8.sh_} | 0 .../phpstorm-url-handler.sh_} | 0 .../wkhtmltopdf.sh_} | 0 install/{040-ulauncher.sh => ulauncher.sh} | 4 +- install/{110-wine.sh => wine.sh} | 4 +- install/{996-zint.sh => zint.sh} | 6 +- install/{003-zsh.sh => zsh.sh} | 4 +- start.sh | 6 - 34 files changed, 255 insertions(+), 81 deletions(-) create mode 100644 .gitignore create mode 100755 gen-makefile.sh rename install/{700-apache.sh => apache.sh} (86%) rename install/{000-apt.sh => apt.sh} (95%) rename install/{120-chrome.sh => chrome.sh} (91%) rename install/{720-composer.sh => composer.sh} (96%) rename install/{020-docker.sh => docker.sh} (90%) rename install/{010-git.sh => git.sh} (91%) rename install/{200-golang.sh => golang.sh} (96%) rename install/{100-grub-customizer.sh => grubc.sh} (71%) rename install/{500-kde-appmenu.sh => kde-appmenu.sh} (95%) rename install/{160-lite-xl.sh => lite-xl.sh} (93%) rename install/{800-mariadb.sh => mariadb.sh} (73%) rename install/{997-nodejs.sh => nodejs.sh} (93%) rename install/{810-pgsql.sh => pgsql.sh} (60%) rename install/{710-php.sh => php.sh} (91%) rename install/{130-postman.sh => postman.sh} (95%) rename install/{150-rustdesk.sh => rustdesk.sh} (51%) rename install/{001-snap.sh => snap.sh} (65%) rename install/{050-syncthing.sh => syncthing.sh} (93%) rename install/{140-telebit.sh => telebit.sh} (88%) rename install/{002-flatpak.sh => todo/flatpak.sh_} (100%) rename install/{730-oci8.sh_ => todo/oci8.sh_} (100%) rename install/{998-phpstorm-url-handler.sh_ => todo/phpstorm-url-handler.sh_} (100%) rename install/{995-wkhtmltopdf.sh => todo/wkhtmltopdf.sh_} (100%) rename install/{040-ulauncher.sh => ulauncher.sh} (70%) rename install/{110-wine.sh => wine.sh} (82%) rename install/{996-zint.sh => zint.sh} (88%) rename install/{003-zsh.sh => zsh.sh} (96%) delete mode 100755 start.sh diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..751553b --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*.bak diff --git a/Makefile b/Makefile index 76c090a..3425097 100644 --- a/Makefile +++ b/Makefile @@ -1,14 +1,112 @@ -## droidcam: Install droidcam -droidcam: - ./install/droidcam.sh +# Autogenerated at 04.07.2022 17:32 by ./gen-makefile.sh -## droidcam-obs: Install droidcam-obs plugin +## apache: Install apache2 (latest) +apache: + ./install/apache.sh + +## apt: Install bunch of software from apt +apt: + ./install/apt.sh + +## chrome: Install google chrome (latest) +chrome: + ./install/chrome.sh + +## composer: Install composer (latest) +composer: + ./install/composer.sh + +## docker: Install docker (latest) + docker-compose (latest) + ppa +docker: + ./install/docker.sh + +## droidcam-obs: Install droidcam-obs plugin v1.5.1 droidcam-obs: ./install/droidcam-obs.sh -#--------------------------------------------------- +## droidcam: Install droidcam v1.8.2 +droidcam: + ./install/droidcam.sh -## help: This message +## git: Install git (latest) +git: + ./install/git.sh + +## golang: Install golang v1.18.3 +golang: + ./install/golang.sh + +## grubc: Install grub-customizer (latest) + ppa +grubc: + ./install/grubc.sh + +## kde-appmenu: Install KDE Window AppMenu Applet +kde-appmenu: + ./install/kde-appmenu.sh + +## lite-xl: Install lite-xl v2.0.5 (draft) +lite-xl: + ./install/lite-xl.sh + +## mariadb: Install mariadb (latest) and php-mysql + phpMyAdmin (if php is installed) +mariadb: + ./install/mariadb.sh + +## nodejs: Install nodejs + npm via nvm +nodejs: + ./install/nodejs.sh + +## pgsql: Install postgresql (latest) and php-pgsql (if php is installed) +pgsql: + ./install/pgsql.sh + +## php: Install php v8.1 + ppa +php: + ./install/php.sh + +## postman: Install postman (latest) +postman: + ./install/postman.sh + +## rustdesk: Install rustdesk v1.1.8 (deb) +rustdesk: + ./install/rustdesk.sh + +## snap: Install bunch of software from snap +snap: + ./install/snap.sh + +## syncthing: Install syncthing (latest) + ppa +syncthing: + ./install/syncthing.sh + +## telebit: Install telebit (latest) +telebit: + ./install/telebit.sh + +## ulauncher: Install ulauncher (latest) + ppa +ulauncher: + ./install/ulauncher.sh + +## wine: Installwine (latest) + ppa (focal) +wine: + ./install/wine.sh + +## zint: Install zint (latest) +zint: + ./install/zint.sh + +## zsh: Install zsh + omz (latest) +zsh: + ./install/zsh.sh + +## help: Show this help message help: Makefile - @echo "Choose a command run:" + @echo "Usage:" + @echo "\tmake \n" + @echo "Available goals:" @sed -n 's/^##//p' $< | column -t -s ':' | sed -e "s/^/\t/" + +## _: Same as 'cat ./install/.sh' +%_: + @cat ./install/$*.sh diff --git a/README.md b/README.md index ee02281..dc9989d 100644 --- a/README.md +++ b/README.md @@ -1,49 +1,52 @@ -# Окружение рабочего стола +# My Ubuntu environment -Набор скриптов для развёртывания привычной рабочей среды на Ubuntu. +`make`-ready bunch of scripts for easily installation of different software. -## Полная установка +## Prerequisites -Если установлен `git` +* `bash`, `zsh` or other `sh`-compatible shell +* `make` +* `git` or `wget` + +## Usage + +### Clone this repo (recommended) ```shell -git clone git@git.anthonyaxenov.ru:anthony/my-env.git --depth=1 +# if git is installed +git clone git@git.axenov.dev:anthony/my-env.git --depth=1 + +# if git is not installed +wget -qO - https://git.axenov.dev/anthony/my-env/archive/master.tar.gz | tar -zxf - + +# switch to repo dir cd my-env -sudo ./start.sh + +# get full list of `make` goals +make help + +# generate new ./Makefile and get full list of `make` goals +./gen-makefile.sh ``` -Если не установлен `git` +### Selective straightforward installation ```shell -wget -qO - http://git.anthonyaxenov.ru/anthony/my-env/archive/master.tar.gz | tar -zxf - -cd my-env -sudo ./start.sh +# from remote file +wget -qO - https://git.axenov.dev/anthony/my-env/raw/branch/master/install/apt.sh | bash + +# from locally cloned repo +./install/apt.sh ``` -Скрипт `start.sh` обработает все `*.sh`-скрипты из [`/install`](/install) по порядку. +## How to add a new software script here -## Частичная установка +1. Create new `./install/*.sh` script. + At the beggining of a file you must write these two lines: + ```shell + #!/bin/bash + ##makedesc: Your description for Makefile + ``` +2. Test your script +3. Run `./gen-makefile.sh` to generate new `./Makefile` -Без полного развёртывания репозитория - -```shell -wget -qO - http://git.anthonyaxenov.ru/anthony/my-env/raw/branch/master/install/000-apt.sh | bash -``` - -После полного развёртывания репозитория (см. полную установку): - -```shell -cd my-env -sudo ./install/000-apt.sh -``` - -## Тема оформления (только MATE) - -Также можно установить визуальное оформление: -* тема: [Budgie Desktop Dark Theme](https://www.pling.com/p/1276879) -* икoнки: [Papirus](https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/) -* курсоры: [Bridge](https://www.mate-look.org/s/Mate/p/999983/), [Capitaine Cursors](https://www.gnome-look.org/p/1148692/) - -```shell -sudo ./theme/install.sh -``` diff --git a/gen-makefile.sh b/gen-makefile.sh new file mode 100755 index 0000000..9e26279 --- /dev/null +++ b/gen-makefile.sh @@ -0,0 +1,30 @@ +#!/bin/bash +mv Makefile Makefile.bak +echo -e "# Autogenerated at $(date +'%d.%m.%Y %H:%M') by ${BASH_SOURCE[0]}\n" > Makefile + +for file in ./install/*.sh; do + name=${file##*/} + name=${name%.sh} + desc=$(cat ${file} | sed -n 2p | sed -n 's/^##makedesc: //p') + [ -z "$desc" ] && desc='' + echo -e "## ${name}: ${desc}\n${name}:\n\t${file}\n" >> Makefile +done; + +cat << EOF >> Makefile +## help: Show this help message +help: Makefile + @echo "Usage:" + @echo "\tmake \n" + @echo "Available goals:" + @sed -n 's/^##//p' $< | column -t -s ':' | sed -e "s/^/\t/" + +## _: Same as 'cat ./install/.sh' +%_: + @cat ./install/\$*.sh +EOF + + +echo "New ./Makefile has been generated!" +echo "Old one has been saved as ./Makefile.bak" +echo +make help diff --git a/install/700-apache.sh b/install/apache.sh similarity index 86% rename from install/700-apache.sh rename to install/apache.sh index ec7e626..44972c5 100755 --- a/install/700-apache.sh +++ b/install/apache.sh @@ -1,4 +1,6 @@ #!/bin/bash +##makedesc: Install apache2 (latest) + echo echo "===============================================" echo "Installing apache2..." diff --git a/install/000-apt.sh b/install/apt.sh similarity index 95% rename from install/000-apt.sh rename to install/apt.sh index 5faa40c..db30228 100755 --- a/install/000-apt.sh +++ b/install/apt.sh @@ -1,4 +1,6 @@ #!/bin/bash +##makedesc: Install bunch of software from apt + echo echo "===============================================" echo "Installing software from apt..." diff --git a/install/120-chrome.sh b/install/chrome.sh similarity index 91% rename from install/120-chrome.sh rename to install/chrome.sh index c250505..6cb713a 100755 --- a/install/120-chrome.sh +++ b/install/chrome.sh @@ -1,4 +1,6 @@ #!/bin/bash +##makedesc: Install google chrome (latest) + echo echo "===============================================" echo "Installing google chrome (latest)..." diff --git a/install/720-composer.sh b/install/composer.sh similarity index 96% rename from install/720-composer.sh rename to install/composer.sh index 6bff97e..d2cab8d 100755 --- a/install/720-composer.sh +++ b/install/composer.sh @@ -1,7 +1,9 @@ #!/bin/bash +##makedesc: Install composer (latest) + echo echo "===============================================" -echo "Installing composer..." +echo "Installing composer (latest)..." echo "===============================================" echo diff --git a/install/020-docker.sh b/install/docker.sh similarity index 90% rename from install/020-docker.sh rename to install/docker.sh index e4baf14..8fb71e0 100755 --- a/install/020-docker.sh +++ b/install/docker.sh @@ -1,7 +1,9 @@ #!/bin/bash +##makedesc: Install docker (latest) + docker-compose (latest) + ppa + echo echo "===============================================" -echo "Installing docker..." +echo "Installing docker (latest)..." echo "===============================================" echo diff --git a/install/droidcam-obs.sh b/install/droidcam-obs.sh index 2cbb805..633d783 100755 --- a/install/droidcam-obs.sh +++ b/install/droidcam-obs.sh @@ -1,4 +1,6 @@ #!/bin/bash +##makedesc: Install droidcam-obs plugin v1.5.1 + # https://www.dev47apps.com/droidcam/linux/ # https://www.dev47apps.com/obs/ # https://www.dev47apps.com/obs/usage.html diff --git a/install/droidcam.sh b/install/droidcam.sh index 43e198a..03e1a44 100755 --- a/install/droidcam.sh +++ b/install/droidcam.sh @@ -1,9 +1,11 @@ #!/bin/bash +##makedesc: Install droidcam v1.8.2 + # https://www.dev47apps.com/droidcam/linux/ echo echo "===============================================" -echo "Installing droidcam..." +echo "Installing droidcam v1.8.2..." echo "===============================================" echo diff --git a/install/010-git.sh b/install/git.sh similarity index 91% rename from install/010-git.sh rename to install/git.sh index 54f8d07..dda5765 100755 --- a/install/010-git.sh +++ b/install/git.sh @@ -1,4 +1,6 @@ #!/bin/bash +##makedesc: Install git (latest) + echo echo "===============================================" echo "Installing git (latest)..." @@ -11,7 +13,6 @@ installed() { ENVDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" ! installed make && sudo apt install -y make -! installed curl && sudo apt install -y curl if installed git; then sudo rm -rf /usr/src/git @@ -21,6 +22,7 @@ if installed git; then sudo make prefix=/usr/local all sudo make prefix=/usr/local install else + ! installed wget && sudo apt install -y wget wget https://github.com/git/git/archive/master.zip -O /tmp/git.zip sudo unzip -q /tmp/git.zip -d /usr/src/git rm /tmp/git.zip @@ -32,6 +34,5 @@ else sudo git clone https://github.com/git/git.git --depth=1 /usr/src/git sudo chown -R $USER: /usr/src/git fi -cd - -cp "$ENVDIR"/dotfiles/.gitconfig $HOME/.gitconfig + git --version diff --git a/install/200-golang.sh b/install/golang.sh similarity index 96% rename from install/200-golang.sh rename to install/golang.sh index a4f7dc9..5867f8b 100755 --- a/install/200-golang.sh +++ b/install/golang.sh @@ -1,4 +1,5 @@ #!/bin/bash +##makedesc: Install golang v1.18.3 # https://go.dev/dl/ # https://golang.org/doc/install diff --git a/install/100-grub-customizer.sh b/install/grubc.sh similarity index 71% rename from install/100-grub-customizer.sh rename to install/grubc.sh index 1452564..3bf5ed5 100755 --- a/install/100-grub-customizer.sh +++ b/install/grubc.sh @@ -1,7 +1,9 @@ #!/bin/bash +##makedesc: Install grub-customizer (latest) + ppa + echo echo "===============================================" -echo "Installing grub-customizer..." +echo "Installing grub-customizer (latest)..." echo "===============================================" echo diff --git a/install/500-kde-appmenu.sh b/install/kde-appmenu.sh similarity index 95% rename from install/500-kde-appmenu.sh rename to install/kde-appmenu.sh index 659250b..3a432d5 100755 --- a/install/500-kde-appmenu.sh +++ b/install/kde-appmenu.sh @@ -1,4 +1,6 @@ -#!/bin/bash +#!/bin/bash (latest) +##makedesc: Install KDE Window AppMenu Applet + echo echo "===============================================" echo "Installing KDE Window AppMenu Applet..." diff --git a/install/160-lite-xl.sh b/install/lite-xl.sh similarity index 93% rename from install/160-lite-xl.sh rename to install/lite-xl.sh index 447f4e7..aad2f08 100755 --- a/install/160-lite-xl.sh +++ b/install/lite-xl.sh @@ -1,4 +1,6 @@ #!/bin/bash +##makedesc: Install lite-xl v2.0.5 (draft) + # DRAFT DRAFT DRAFT DRAFT DRAFT DRAFT DRAFT DRAFT # DRAFT DRAFT DRAFT DRAFT DRAFT DRAFT DRAFT DRAFT @@ -11,7 +13,7 @@ [ $1 ] && LITEXLVER="$1" || LITEXLVER="2.0.5" echo echo "===============================================" -echo "Installing lite-xl${LITEXLVER}..." +echo "Installing lite-xl v${LITEXLVER}..." echo "===============================================" echo diff --git a/install/800-mariadb.sh b/install/mariadb.sh similarity index 73% rename from install/800-mariadb.sh rename to install/mariadb.sh index bf3724a..149d14d 100755 --- a/install/800-mariadb.sh +++ b/install/mariadb.sh @@ -1,7 +1,9 @@ #!/bin/bash +##makedesc: Install mariadb (latest) and php-mysql + phpMyAdmin (if php is installed) + echo echo "===============================================" -echo "Installing mariadb..." +echo "Installing mariadb (latest)..." echo "===============================================" echo diff --git a/install/997-nodejs.sh b/install/nodejs.sh similarity index 93% rename from install/997-nodejs.sh rename to install/nodejs.sh index f3f9a56..44bdbaa 100755 --- a/install/997-nodejs.sh +++ b/install/nodejs.sh @@ -1,4 +1,6 @@ #!/bin/bash +##makedesc: Install nodejs + npm via nvm + echo echo "===============================================" echo "Installing nodejs..." diff --git a/install/810-pgsql.sh b/install/pgsql.sh similarity index 60% rename from install/810-pgsql.sh rename to install/pgsql.sh index 766af66..5386919 100755 --- a/install/810-pgsql.sh +++ b/install/pgsql.sh @@ -1,7 +1,9 @@ #!/bin/bash +##makedesc: Install postgresql (latest) and php-pgsql (if php is installed) + echo echo "===============================================" -echo "Installing postgresql..." +echo "Installing postgresql (latest)..." echo "===============================================" echo @@ -11,4 +13,4 @@ installed() { sudo apt install -y --autoremove postgresql postgresql-contrib sudo service postgresql restart -installed php && sudo apt install -y --autoremove php-pgsql +installed 'php' && sudo apt install -y --autoremove php-pgsql diff --git a/install/710-php.sh b/install/php.sh similarity index 91% rename from install/710-php.sh rename to install/php.sh index 6d983a2..ed604a4 100755 --- a/install/710-php.sh +++ b/install/php.sh @@ -1,5 +1,7 @@ #!/bin/bash -PHPVER="8.1" +##makedesc: Install php v8.1 + ppa + +[ $1 ] && PHPVER="$1" || PHPVER="8.1" echo echo "===============================================" echo "Installing php${PHPVER}..." diff --git a/install/130-postman.sh b/install/postman.sh similarity index 95% rename from install/130-postman.sh rename to install/postman.sh index cd1d5b7..0d662f0 100755 --- a/install/130-postman.sh +++ b/install/postman.sh @@ -1,4 +1,6 @@ #!/bin/bash +##makedesc: Install postman (latest) + echo echo "===============================================" echo "Installing postman (latest)..." diff --git a/install/150-rustdesk.sh b/install/rustdesk.sh similarity index 51% rename from install/150-rustdesk.sh rename to install/rustdesk.sh index 1e9084e..cbb00cc 100755 --- a/install/150-rustdesk.sh +++ b/install/rustdesk.sh @@ -1,14 +1,16 @@ #!/bin/bash -VER="1.1.8" +##makedesc: Install rustdesk v1.1.8 (deb) + +[ $1 ] && RDVER="$1" || RDVER="1.1.8" echo echo "===============================================" -echo "Installing rustdesk v${VER}..." +echo "Installing rustdesk v${RDVER}..." echo "===============================================" echo # https://github.com/rustdesk/rustdesk sudo apt install libxdo3 -wget "http://github.com/rustdesk/rustdesk/releases/download/${VER}/rustdesk-${VER}.deb" -qO /tmp/rustdesk.deb +wget "http://github.com/rustdesk/rustdesk/releases/download/${RDVER}/rustdesk-${RDVER}.deb" -qO /tmp/rustdesk.deb sudo dpkg -i /tmp/rustdesk.deb rm /tmp/rustdesk.deb diff --git a/install/001-snap.sh b/install/snap.sh similarity index 65% rename from install/001-snap.sh rename to install/snap.sh index bbeae80..fcaed96 100755 --- a/install/001-snap.sh +++ b/install/snap.sh @@ -1,7 +1,9 @@ #!/bin/bash +##makedesc: Install bunch of software from snap + echo echo "===============================================" -echo "Installing snap and its software..." +echo "Installing software from snap..." echo "===============================================" echo @@ -19,22 +21,22 @@ if ! installed snapd; then sudo apt install -y --autoremove snapd gnome-software-plugin-snap fi -snapi snap-store +# snapi snap-store snapi telegram-desktop snapi code -snapi phpstorm +# snapi phpstorm snapi skype -snapi audacity -snapi flameshot -snapi gtk-common-themes -snapi gtk2-common-themes -snapi kde-frameworks-5-core18 +# snapi audacity +# snapi flameshot +# snapi gtk-common-themes +# snapi gtk2-common-themes +# snapi kde-frameworks-5-core18 snapi zoom-client snapi peek # https://certbot.eff.org/ -snapi certbot -sudo ln -s /snap/bin/certbot /usr/bin/certbot +# snapi certbot +# sudo ln -s /snap/bin/certbot /usr/bin/certbot # snapi mysql-workbench-community # snapi dbeaver-ce diff --git a/install/050-syncthing.sh b/install/syncthing.sh similarity index 93% rename from install/050-syncthing.sh rename to install/syncthing.sh index 308eab5..a9d81b4 100755 --- a/install/050-syncthing.sh +++ b/install/syncthing.sh @@ -1,7 +1,9 @@ #!/bin/bash +##makedesc: Install syncthing (latest) + ppa + echo echo "===============================================" -echo "Installing syncthing..." +echo "Installing syncthing (latest) + ppa..." echo "===============================================" echo diff --git a/install/140-telebit.sh b/install/telebit.sh similarity index 88% rename from install/140-telebit.sh rename to install/telebit.sh index ca5550f..8164340 100755 --- a/install/140-telebit.sh +++ b/install/telebit.sh @@ -1,7 +1,9 @@ #!/bin/bash +##makedesc: Install telebit (latest) + echo echo "===============================================" -echo "Installing telebit..." +echo "Installing telebit (latest)..." echo "===============================================" echo diff --git a/install/002-flatpak.sh b/install/todo/flatpak.sh_ similarity index 100% rename from install/002-flatpak.sh rename to install/todo/flatpak.sh_ diff --git a/install/730-oci8.sh_ b/install/todo/oci8.sh_ similarity index 100% rename from install/730-oci8.sh_ rename to install/todo/oci8.sh_ diff --git a/install/998-phpstorm-url-handler.sh_ b/install/todo/phpstorm-url-handler.sh_ similarity index 100% rename from install/998-phpstorm-url-handler.sh_ rename to install/todo/phpstorm-url-handler.sh_ diff --git a/install/995-wkhtmltopdf.sh b/install/todo/wkhtmltopdf.sh_ similarity index 100% rename from install/995-wkhtmltopdf.sh rename to install/todo/wkhtmltopdf.sh_ diff --git a/install/040-ulauncher.sh b/install/ulauncher.sh similarity index 70% rename from install/040-ulauncher.sh rename to install/ulauncher.sh index 129fe1d..4b061c4 100755 --- a/install/040-ulauncher.sh +++ b/install/ulauncher.sh @@ -1,7 +1,9 @@ #!/bin/bash +##makedesc: Install ulauncher (latest) + ppa + echo echo "===============================================" -echo "Installing ulauncher..." +echo "Installing ulauncher (latest) + ppa..." echo "===============================================" echo diff --git a/install/110-wine.sh b/install/wine.sh similarity index 82% rename from install/110-wine.sh rename to install/wine.sh index 4c073eb..1106e88 100755 --- a/install/110-wine.sh +++ b/install/wine.sh @@ -1,7 +1,9 @@ #!/bin/bash +##makedesc: Installwine (latest) + ppa (focal) + echo echo "===============================================" -echo "Installing wine..." +echo "Installing wine (latest)..." echo "===============================================" echo diff --git a/install/996-zint.sh b/install/zint.sh similarity index 88% rename from install/996-zint.sh rename to install/zint.sh index 8d9c7f4..fac055b 100755 --- a/install/996-zint.sh +++ b/install/zint.sh @@ -1,7 +1,9 @@ #!/bin/bash +##makedesc: Install zint (latest) + echo echo "===============================================" -echo "Installing zint..." +echo "Installing zint (latest)..." echo "===============================================" echo @@ -14,7 +16,7 @@ sudo apt install -y --autoremove \ if installed git; then # 2.9.* =============================================================================== - sudo git clone git://git.code.sf.net/p/zint/code /usr/src/zint + sudo git clone git@github.com:zint/zint.git /usr/src/zint cd /usr/src/zint sudo cmake . sudo make diff --git a/install/003-zsh.sh b/install/zsh.sh similarity index 96% rename from install/003-zsh.sh rename to install/zsh.sh index 8582b93..6ed9bec 100755 --- a/install/003-zsh.sh +++ b/install/zsh.sh @@ -1,7 +1,9 @@ #!/bin/bash +##makedesc: Install zsh + omz (latest) + echo echo "===============================================" -echo "Installing zsh + oh-my-zsh" +echo "Installing zsh + omz (latest)..." echo "===============================================" echo diff --git a/start.sh b/start.sh deleted file mode 100755 index 4c8cf9d..0000000 --- a/start.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -set -e -for script in "$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"/install/*.sh -do - . "$script" -done