ouroboros-gorup/obosdi
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rebrand and clean

Browse source
This commit is contained in:
nelle 2023-08-10 10:32:01 -06:00
parent c44809d18a
commit d3cbecdf48
6 changed files with 57 additions and 201 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
CONTRIBUTING.md
View file

@ -1,10 +0,0 @@
# archdi CONTRIBUTING
## Contributing :
* Open an issue before work to hard
* **Work on the src branch**
* **Use tab for identation**
* **Preserve identation on empty line**
* **Test your changes**
- [ ] I've read these rules before submitting my PR.

26
README.md
View file

@ -1,31 +1,29 @@
# archdi # obosdi
### Fork of [MatMoul's archdi](https://github.com/MatMoul/archdi)
Just a simple bash script wizard to install and configure a full personal computer with Arch Linux. Just a simple bash script wizard to install and configure a full personal computer with Ourobor.OS.
First, install Arch Linux with the official media and optionally with archfi.<br /> First, install Ourobor.OS with the official media and optionally with obosfi.<br />
Look at archfi project to start your arch linux installation : https://github.com/MatMoul/archfi Look at obosfi project to start your Ourobor.OS installation : https://git.ouroboros.group/Ouroboros/obos-fi
After reboot and your network ready, download the script: After reboot and your network ready, download the script:
curl -L archdi.sf.net/archdi > archdi curl -L git.ouroboros.group/Ouroboros/obosdi/raw/branch/master/obosdi > obosdi
or if sourceforge is down:
curl -L matmoul.github.io/archdi > archdi
And run the script: And run the script:
sh archdi sh obosdi
Or you can install it on your system with: Or you can install it on your system with:
sh archdi -i sh obosdi -i
And then you can use archdi cmd.<br /> And then you can use obosdi cmd.<br />
With this, you can make your updates or install your packages later. With this, you can make your updates or install your packages later.
You can watch my videos to show how to use it :<br /> You can watch MatMoul's videos to show how to use it :<br />
https://www.youtube.com/playlist?list=PLytHgIKLV1caHlCrcTSkm5OF2WSVI1_Sq https://www.youtube.com/playlist?list=PLytHgIKLV1caHlCrcTSkm5OF2WSVI1_Sq
This package is only a launcher for archdi-pkg.<br /> This package is only a launcher for obosdi-pkg.<br />
If you want ask for new features, open an issue on https://github.com/MatMoul/archdi-pkg If you want ask for new features, open an issue on https://github.com/MatMoul/obosdi-pkg

25
README.txt
View file

@ -1,25 +0,0 @@
# archdi
Just a simple bash script wizard to install and configure a full personal computer with Arch Linux.
First, install Arch Linux with the official media and optionally with archfi.
Look at archfi project to start your arch linux installation : https://github.com/MatMoul/archfi
After reboot and your network ready, download the script :
curl -L archdi.sf.net/archdi > archdi
or if sourceforge is down :
curl -L matmoul.github.io/archdi > archdi
And run the script :
sh archdi
Or you can install it on your system with
sh archdi -i
And then you can use archdi cmd.
With this, you can make your updates or install your packages later.
You can watch my videos to show how to use it :
https://www.youtube.com/playlist?list=PLytHgIKLV1caHlCrcTSkm5OF2WSVI1_Sq
This package is only a launcher for archdi-pkg.
If you want ask for new features, open an issue on https://github.com/MatMoul/archdi-pkg

108
makerelease
View file

@ -1,108 +0,0 @@
#!/bin/bash
prjname=archdi
version=$(date +"%Y.%m.%d.%H.%M.%S")
branch=$(git rev-parse --abbrev-ref HEAD)
ssh -T git@github.com
if [ ! "$?" = "1" ]; then
echo "No Github ssh key loaded exiting..."
exit 1
fi
scp matmoul@web.sourceforge.net:/home/frs/project/$prjname/release/bin/2018.06.05.01.34.45/README.txt /dev/null
if [ ! "$?" = "0" ]; then
echo "No Sourceforge ssh key loaded exiting..."
exit 1
fi
clear
read -p "Current branch is $branch. Continue ? (y/N)" choice
case "$choice" in
n|N|'' )
echo "cancel build !"
exit 1
;;
y|Y ) echo "Begin Build Release...";;
* )
echo "cancel build !"
exit 1
;;
esac
echo "Building version $version..."
echo ""
echo "Finalise archdi script..."
sed -i /^apptitle=/c\apptitle=\""Arch Linux Desktop Install (archdi) - Version: $version (GPLv3)"\" archdi
sed -i /version=/c\version=\""$version"\" archdi
echo "Set version..."
echo "$version" >version
chmod 640 version
echo "Make last commit..."
git commit -a -m "New Release : $version"
if [ ! "$branch" = "master" ]; then
echo "Merge branch $branch to master..."
git checkout master
git pull
git merge $branch
read -p "Delete branch $branch ? (y/N)" choice
case "$choice" in
y|Y )
git branch -D $branch
;;
esac
fi
read -p "Publish to server ? (Y/n)" choice
case "$choice" in
n|N )
exit 1
;;
esac
echo "Create index.html..."
fle=$(cat archdi)
git checkout gh-pages
git pull
echo "$fle" > index.html
chmod 640 index.html
git commit -a -m "New Release : $version"
echo "Push index.html..."
git push
git checkout master
echo "Push release..."
git push
#Sourceforge :
targetpath=.build/$version
mkdir -p $targetpath
cp -R * $targetpath
echo "Publish release..."
rsync -r $targetpath matmoul@web.sourceforge.net:/home/frs/project/$prjname/release/bin/
echo "Update redirect page..."
pubfile=.build/index.php
echo "<?php" > $pubfile
echo "header(\"Location: http://downloads.sourceforge.net/project/$prjname/release/bin/$version/$prjname\");" >> $pubfile
echo "exit;" >> $pubfile
echo "?>" >> $pubfile
scp $pubfile matmoul@web.sourceforge.net:/home/project-web/$prjname/htdocs/$prjname/index.php
scp version matmoul@web.sourceforge.net:/home/project-web/$prjname/htdocs/version
rm -R .build
if [ ! "$branch" = "master" ]; then
git checkout $branch
git merge master
git push
fi

87
archdi → obosdi
View file

@ -1,44 +1,45 @@
#!/bin/bash #!/bin/bash
# Arch Linux Desktop Install (archdi) # Ourobor.OS Dekstop Install (obos-di)
# ----------------------------------- # --------------------------------
# author : MatMoul # archfi author : MatMoul
# https://github.com/MatMoul # https://github.com/MatMoul
# http://sourceforge.net/u/matmoul # http://sourceforge.net/u/matmoul
# project : https://github.com/MatMoul/archdi # obosfi author : LimePotato (Ouroboros)
# http://sourceforge.net/projects/archdi/ # https://limepot.xyz/
# license : GPLv3 (http://opensource.org/licenses/GPL-3.0) # https://git.ouroboros.group/Ouroboros/
# https://git.ouroboros.group/LimePotato/
#
# project : https://git.ouroboros.group/Ouroboros/obosdi
#
# license : LGPL-3.0 (http://opensource.org/licenses/lgpl-3.0.html)
apptitle="Arch Linux Desktop Install (archdi) - Version: 2022.11.11.02.04.49 (GPLv3)" apptitle="Ourobor.OS Desktop Install (obosdi) - Version: 0.0.1 (GPLv3)"
version="2022.11.11.02.04.49" version="0.0.1"
cachedir=~/.cache/archdi cachedir=~/.cache/obosdi
lastverurl1=http://archdi.sourceforge.net/version lastverurl1=https://git.ouroboros.group/Ouroboros/obosdi/src/branch/master/version
lastverurl2=https://raw.githubusercontent.com/MatMoul/archdi/master/version lastverurl2=https://git.ouroboros.group/Ouroboros/obosdi/raw/branch/master/version
lastverurl3=https://cdn.jsdelivr.net/gh/MatMoul/archdi@master/version
binurl1=archdi.sourceforge.net/archdi binurl1=https://git.ouroboros.group/Ouroboros/obosdi/src/branch/master/obosdi
binurl2=matmoul.github.io/archdi binurl2=https://git.ouroboros.group/Ouroboros/obosdi/raw/branch/master/obosdi
binurl3=https://cdn.jsdelivr.net/gh/MatMoul/archdi@master/archdi
liburl1=http://archdi.sourceforge.net/archdi-lib liburl1=https://git.ouroboros.group/Ouroboros/obosdi-pkg/src/branch/master/lib
liburl2=https://raw.githubusercontent.com/MatMoul/archdi-pkg/master/lib liburl2=https://git.ouroboros.group/Ouroboros/obosdi-pkg/raw/branch/master/lib
liburl3=https://cdn.jsdelivr.net/gh/MatMoul/archdi-pkg@master/lib
pkgurl1=http://archdi.sourceforge.net/archdi-pkg pkgurl1=https://git.ouroboros.group/Ouroboros/obosdi-pkg
pkgurl2=https://raw.githubusercontent.com/MatMoul/archdi-pkg/master/pkg.tar pkgurl2=https://git.ouroboros.group/Ouroboros/obosdi-pkg/raw/branch/master/pkg.tar
pkgurl3=https://cdn.jsdelivr.net/gh/MatMoul/archdi-pkg@master/pkg.tar
help(){ help(){
echo "-h | --help : this screen" echo "-h | --help : this screen"
echo "-i | --install : install" echo "-i | --install : install"
echo "-l | --local dir : run local archdi-pkg dir" echo "-l | --local dir : run local obosdi-pkg dir"
echo "-t | --test githubuser branch : launch a forked branch" echo "-t | --test githubuser branch : launch a forked branch"
echo "no args : start archdi" echo "no args : start obosdi"
} }
install(){ install(){
@ -46,13 +47,13 @@ install(){
echo "Install $apptitle ..." echo "Install $apptitle ..."
echo "" echo ""
chmod 755 $0 2>/dev/null chmod 755 $0 2>/dev/null
mv $0 /usr/local/bin/archdi 2>/dev/null mv $0 /usr/local/bin/obosdi 2>/dev/null
echo "" echo ""
echo "$apptitle is installed." echo "$apptitle is installed."
echo "type archdi to start." echo "type obosdi to start."
if [[ -f "/usr/bin/archdi" ]]; then if [[ -f "/usr/bin/obosdi" ]]; then
rm /usr/bin/archdi 2>/dev/null rm /usr/bin/obosdi 2>/dev/null
echo "If archdi doesn't start after update, run 'hash -r'" echo "If obosdi doesn't start after update, run 'hash -r'"
fi fi
} }
@ -79,28 +80,28 @@ run(){
if [ "$chrootoption" = "true" ]; then if [ "$chrootoption" = "true" ]; then
./lib --chroot ./lib --chroot
if [ ! "$?" = "0" ]; then if [ ! "$?" = "0" ]; then
archdi --branch master obosdi --branch master
fi fi
else else
if [ ! "$pkgdir" = "" ]; then if [ ! "$pkgdir" = "" ]; then
sed -i "/apptitle=/c\apptitle=\"Arch Linux Desktop Install (archdi) - local: $pkgdir (GPLv3)\"" lib sed -i "/apptitle=/c\apptitle=\"Ourobor.OS Desktop Install (obosdi) - local: $pkgdir (GPLv3)\"" lib
sed -i "/baseurl=/c\baseurl=$pkgdir" lib sed -i "/baseurl=/c\baseurl=$pkgdir" lib
./lib --root ./lib --root
if [ ! "$?" = "0" ]; then if [ ! "$?" = "0" ]; then
archdi --branch master obosdi --branch master
fi fi
else else
if [ "$branchoption" = "" ]; then if [ "$branchoption" = "" ]; then
./lib --root ./lib --root
if [ ! "$?" = "0" ]; then if [ ! "$?" = "0" ]; then
archdi --branch master obosdi --branch master
fi fi
else else
sed -i "/apptitle=/c\apptitle=\"Arch Linux Desktop Install (archdi) - Branch: $branchoption (GPLv3)\"" lib sed -i "/apptitle=/c\apptitle=\"Ourobor.OS Desktop Install (obosdi) - Branch: $branchoption (GPLv3)\"" lib
sed -i "/baseurl=/c\baseurl=https://raw.githubusercontent.com/$githubuser/archdi-pkg/$branchoption" lib sed -i "/baseurl=/c\baseurl=https://git.ouroboros.group/Ouroboros/obosdi-pkg/raw/branch/master/$branchoption" lib
./lib --root ./lib --root
if [ ! "$?" = "0" ]; then if [ ! "$?" = "0" ]; then
archdi --branch master obosdi --branch master
fi fi
fi fi
fi fi
@ -164,12 +165,12 @@ dependencies(){
} }
chkupgrade(){ chkupgrade(){
if [[ "$0" = "/usr/local/bin/archdi" ]]; then if [[ "$0" = "/usr/local/bin/obosdi" ]]; then
if [ ! "$version" = "$lastver" ]; then if [ ! "$version" = "$lastver" ]; then
if (whiptail --backtitle "$apptitle" --yesno "New version found !\n\nInstall last version ?" 0 0) then if (whiptail --backtitle "$apptitle" --yesno "New version found !\n\nInstall last version ?" 0 0) then
cd /tmp cd /tmp
curl -LO $binurl curl -LO $binurl
sh archdi -i sh obosdi -i
exit 0 exit 0
fi fi
fi fi
@ -186,8 +187,8 @@ while (( "$#" )); do
--chroot) chrootoption="true";; --chroot) chrootoption="true";;
-b | --branch) -b | --branch)
shift shift
liburl1=https://raw.githubusercontent.com/MatMoul/archdi-pkg/$1/lib liburl1=https://git.ouroboros.group/Ouroboros/obosdi-pkg/raw/branch/master/$1/lib
liburl2=https://raw.githubusercontent.com/MatMoul/archdi-pkg/$1/lib liburl2=https://git.ouroboros.group/Ouroboros/obosdi-pkg/raw/branch/master/$1/lib
pkgurl1="" pkgurl1=""
pkgurl2="" pkgurl2=""
branchoption="$1" branchoption="$1"
@ -195,14 +196,14 @@ while (( "$#" )); do
;; ;;
-l | --local) -l | --local)
shift shift
apptitle="Arch Linux Desktop Install (archdi) - Version: local ($1)" apptitle="Ourobor.OS Desktop Install (obosdi) - Version: local ($1)"
version="2022.11.11.02.04.49" version="0.0.1"
pkgdir="$1" pkgdir="$1"
;; ;;
-t | --test) -t | --test)
shift shift
liburl1=https://raw.githubusercontent.com/$1/archdi-pkg/$2/lib liburl1=https://git.ouroboros.group/Ouroboros/obosdi-pkg/raw/branch/master/$1/lib
liburl2=https://raw.githubusercontent.com/$1/archdi-pkg/$2/lib liburl2=https://git.ouroboros.group/Ouroboros/obosdi-pkg/raw/branch/master/$1/lib
pkgurl1="" pkgurl1=""
pkgurl2="" pkgurl2=""
branchoption="$2" branchoption="$2"

2
version
View file

@ -1 +1 @@
2022.11.11.02.04.49 0.0.1