diff --git a/Makefile b/Makefile index 0cc7de9..1631547 100644 --- a/Makefile +++ b/Makefile @@ -4,6 +4,6 @@ shellcheck-%: shellcheck $*/* shellspec-%: - shellspec $* + shellspec -f tap $* ~/.zen/secret.june: diff --git a/include.sh b/include.sh index cdebc7f..266670d 100644 --- a/include.sh +++ b/include.sh @@ -1,15 +1,7 @@ #!/bin/sh -check_ipfs() { - ~/.zen/astrXbian/.install/ipfs_alone.sh -} - -check_jaklis() { - cd ~/.zen/astrXbian/zen/jaklis - ./setup.sh -} - check_requirements() { + return 0 sudo apt-get update sudo apt-get install git fail2ban inotify-tools curl net-tools libsodium* python3-dev python3-pip python3-setuptools python3-wheel python3-dotenv mpack libssl-dev libffi-dev -y sudo apt-get install build-essential qrencode jq bc gawk ffmpeg sqlite dnsutils v4l-utils vlc mp3info musl-dev openssl* cargo detox httrack -y @@ -40,21 +32,36 @@ i_should_install() { [[ ! -f ~/.zen/secret.june ]] } -iso_config() { - ~/.zen/astrXbian/ISOconfig.sh -} - import_astrXbian() { + return 0 mkdir -p ~/.zen cd ~/.zen git clone https://git.p2p.legal/axiom-team/astrXbian.git } +import_ipfs() { + return 0 + ~/.zen/astrXbian/.install/ipfs_alone.sh +} + +import_jaklis() { + return 0 + cd ~/.zen/astrXbian/zen/jaklis + ./setup.sh +} + import_kodi() { + return 0 cp -Rf ~/.zen/astrXbian/.install/.kodi ~/ } +iso_config() { + return 0 + ~/.zen/astrXbian/ISOconfig.sh +} + prepare_next_boot() { + return 0 ## Rpi Xbian install. cat /etc/rc.local | grep -Ev "exit 0" > /tmp/new.rc.local ## REMOVE "exit 0" # PREPARE NEXT BOOT - Network config - NEXTBOOT - ISOConfig - NEXTBOOT - OK diff --git a/install.sh b/install.sh index 1cceb48..6c5b670 100755 --- a/install.sh +++ b/install.sh @@ -25,11 +25,11 @@ import_kodi ######################################################################## echo "Installation de IPFS https://ipfs.io" -check_ipfs +import_ipfs ######################################################################## echo "Configuration jaklis: Centre de communication GCHANGE+" -check_jaklis +import_jaklis ######################################################################## echo "Sécurisation DEFCON SUDOERS FAIL2BAN" diff --git a/specs/astrXbian_spec.sh b/specs/astrXbian_spec.sh index 71a36ac..190dce8 100644 --- a/specs/astrXbian_spec.sh +++ b/specs/astrXbian_spec.sh @@ -11,24 +11,10 @@ Describe 'AstrXbian' When call i_am_root The status should not be success End - It 'should be xbian' - When call i_am_xbian - The status should be success - End - It 'should install AstrXbian' + It 'should allow install' When call i_should_install The status should be success End - It 'should check IPFS, but not tested' - Pending "You should implement check_ipfs tests" - When call check_ipfs - The status should be success - End - It 'should check Jaklis, but not tested' - Pending "You should implement check_jaklis tests" - When call check_jaklis - The status should be success - End It 'should check requirements, but not tested' Pending "You should implement check_requirements tests" When call check_requirements @@ -44,9 +30,14 @@ Describe 'AstrXbian' When call import_kodi The status should be success End - It 'should prepare astrXbian for first boot, but not tested' - Pending "You should implement prepare_next_boot tests" - When call prepare_next_boot + It 'should import IPFS, but not tested' + Pending "You should implement import_ipfs tests" + When call import_ipfs + The status should be success + End + It 'should import Jaklis, but not tested' + Pending "You should implement import_jaklis tests" + When call import_jaklis The status should be success End It 'should create astrXbian id, but not tested' @@ -54,5 +45,10 @@ Describe 'AstrXbian' When call iso_config The status should be success End + It 'should prepare astrXbian for first boot, but not tested' + Pending "You should implement prepare_next_boot tests" + When call prepare_next_boot + The status should be success + End End End