Bonjour,
J'ai un léger problème, en allant sur seedbox manager j'ai vu qu'une version plus récente était disponible (2.4.4 de mémoire)...
j'ai donc lancer les commandes suivantes mais les messages d'erreurs sont assez flippant et depuis je n'ai plus rien à l'adresse de Seedbox-Manager...
Bref j'ai fait le gros boulet...
Pour info j'avais installer ma seedbox avec le script d'ex_rat... il y a quelques temps (un bon mois)
cd /var/www/seedbox-manager/
git reset --hard HEAD
résultat
HEAD is now at b0892a1 Merge pull request #10 from Micdu70/patch-1
git pull origin master
résultat
remote: Counting objects: 442, done.
remote: Total 442 (delta 25), reused 25 (delta 25), pack-reused 417
Receiving objects: 100% (442/442), 75.56 KiB, done.
Resolving deltas: 100% (216/216), completed with 18 local objects.
From https://github.com/Magicalex/seedbox-manager
* branch master -> FETCH_HEAD
Auto-merging version.json
CONFLICT (add/add): Merge conflict in version.json
Auto-merging public/themes/spiritofbonobo/template/notif-option.html
CONFLICT (add/add): Merge conflict in public/themes/spiritofbonobo/template/notif-option.html
Auto-merging public/themes/spiritofbonobo/template/notif-admin.html
CONFLICT (add/add): Merge conflict in public/themes/spiritofbonobo/template/notif-admin.html
Auto-merging public/themes/spiritofbonobo/template/bloc-support-user.html
CONFLICT (add/add): Merge conflict in public/themes/spiritofbonobo/template/bloc-support-user.html
Auto-merging public/themes/spiritofbonobo/option.html
CONFLICT (add/add): Merge conflict in public/themes/spiritofbonobo/option.html
Auto-merging public/themes/spiritofbonobo/administration.html
CONFLICT (add/add): Merge conflict in public/themes/spiritofbonobo/administration.html
Auto-merging public/themes/default/template/notif-option.html
CONFLICT (add/add): Merge conflict in public/themes/default/template/notif-option.html
Auto-merging public/themes/default/template/notif-admin.html
CONFLICT (add/add): Merge conflict in public/themes/default/template/notif-admin.html
Auto-merging public/themes/default/option.html
CONFLICT (add/add): Merge conflict in public/themes/default/option.html
Auto-merging public/themes/default/administration.html
CONFLICT (add/add): Merge conflict in public/themes/default/administration.html
Auto-merging public/install/installation.php
CONFLICT (add/add): Merge conflict in public/install/installation.php
Auto-merging public/index.php
CONFLICT (add/add): Merge conflict in public/index.php
Auto-merging composer.json
CONFLICT (add/add): Merge conflict in composer.json
Auto-merging bower.json
CONFLICT (add/add): Merge conflict in bower.json
Auto-merging app/downloads.php
CONFLICT (add/add): Merge conflict in app/downloads.php
Auto-merging app/Lib/Users.php
CONFLICT (add/add): Merge conflict in app/Lib/Users.php
Auto-merging app/Lib/Support.php
CONFLICT (add/add): Merge conflict in app/Lib/Support.php
Auto-merging app/Lib/Server.php
CONFLICT (add/add): Merge conflict in app/Lib/Server.php
Auto-merging app/Lib/Install.php
CONFLICT (add/add): Merge conflict in app/Lib/Install.php
Auto-merging README.md
CONFLICT (content): Merge conflict in README.md
Automatic merge failed; fix conflicts and then commit the result.
Et comme je suis con j'ai continué
composer update
du coup
[Seld\JsonLint\ParsingException]
"./composer.json" does not contain valid JSON
Parse error on line 3:
...nage your seedbox",<<<<<<< HEAD "re
---------------------^
Expected: 'STRING' - It appears you have an extra trailing comma
update [--prefer-source] [--prefer-dist] [--dry-run] [--dev] [--no-dev] [--lock] [--no-plugins] [--no-custom-installers] [--no-autoloader] [--no-scripts] [--no-progress] [--with-dependencies] [-v|vv|vvv|--verbose] [-o|--optimize-autoloader] [--ignore-platform-reqs] [--prefer-stable] [--prefer-lowest] [packages1] ... [packagesN]
Et pour finir... maxi couillon
bower update --allow-root
du coup
bower EMALFORMED Failed to read /var/www/seedbox-manager/bower.json
Additional error details:
Unexpected token <
Si quelqu'un sait comment réparer mes conneries... je suis preneur...
d'avance merci pour votre aide...
