Skip to content

Commit

Permalink
Updated to the author's latest and last release v4.5.3
Browse files Browse the repository at this point in the history
Version bump and references to old github project removed.
  • Loading branch information
sndirsch committed Aug 15, 2019
1 parent cf96c36 commit 929abac
Show file tree
Hide file tree
Showing 9 changed files with 36 additions and 122 deletions.
69 changes: 0 additions & 69 deletions CONTRIBUTING.md

This file was deleted.

2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ FROM pritunl/archlinux:latest
# Usage:
# $ docker build -t ingress-ice .
# $ docker run -v /path/to/.ingress-ice.conf:/.ingress-ice.conf -v /path/to/screenshots/:/screenshots ingress-ice
MAINTAINER nibogd <[email protected].com>
MAINTAINER ingress.netlify.com

RUN pacman-key --populate archlinux
RUN pacman -Syu --noconfirm
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2016 nibogd (github.com/nibogd)
Copyright (c) 2014-2018 Ingress ICE developers (https://ingress.netlify.com)

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
60 changes: 25 additions & 35 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
[ingress-ice](http://ingress.netlify.com/)
===========
Automatic screenshooter for ingress intel map.
![](https://cloud.githubusercontent.com/assets/2771136/7915684/cfaba8c4-0887-11e5-86b9-5b4fe05ababc.png)

v4.5.3 "final" release. Development will not be continued.

Features:
=========
- Captures screenshots of ingress intel map every *n* seconds
- Set your location
- Authentication using login and password or [cookies](https://github.com/nibogd/ingress-ice/wiki/Cookies-Authentication) available
- Authentication using login and password or cookies available
- Supports 2-step authentication
- Doesn't require X server to be run
- Set portal levels to display
Expand All @@ -16,26 +17,7 @@ Features:
- Fully cross-platform: supports Windows, GNU/Linux and Mac OS X!
- Hide some features like fields or links from the map (IITC only)
- It's portable — you can run ice from a flash drive or a DropBox folder
- Can be run via [Docker](https://github.com/nibogd/ingress-ice/wiki/Docker) ([Docker Hub](https://hub.docker.com/r/nikitakun/ingress-ice/))

See our [samples](https://github.com/nibogd/ingress-ice/wiki/Example-Records).

[<img src="https://developers.google.com/+/images/branding/g+128.png" width="16"> +Ingress ICE](https://plus.google.com/u/0/115529923593338751190/posts)

[<img src="https://g.twimg.com/Twitter_logo_blue.png" width="16"> @ingress_ice](https://twitter.com/ingress_ice)

Download
========
### Stable
See [releases](https://github.com/nibogd/ingress-ice/releases) to download the latest stable version. On linux, you may need to install these [dependencies](https://github.com/nibogd/ingress-ice/wiki/Dependencies-(Linux)).
### Development
> *WARNING!* the development version may be unstable.
You can download the whole ingress-ice using the [![Download ZIP](https://cloud.githubusercontent.com/assets/2771136/12703381/36d9adb4-c85b-11e5-81b1-ec0dbef9f679.png)](https://github.com/nibogd/ingress-ice/archive/master.zip) button on the top or clone this repo via git from the link on top. You will need to manually download PhantomJS binary for your platform and put it into `phantomjs.exe` at the root of repo if you are using windows or `phantomjs` otherwise.

PhantomJS binaries' downloads are located [here](http://phantomjs.org/download.html).

To build archives for every operating system, launch `./build.sh`. It will automatically download PhantomJS executables and pack them with Ingress ICE.
- Can be run via Docker (see the Dockerfile for usage)

Usage
=====
Expand All @@ -47,35 +29,43 @@ Usage
3. It will save captured screenshots with into `ice-2014-07-13--09-13-37.png`, `ice-2014-07-13--09-14-07.png`...
4. You can copy `ice/ingress-ice.conf.sample` to `ingress-ice.conf` in the ice root and enter your settings there, so you can have different configurations for every `ingress-ice`

If you want to reconfigure the script, just double click `reconfigure.cmd`. If you want to use cookies instead of login and password, see [cookies authentication](https://github.com/nibogd/ingress-ice/wiki/Cookies-Authentication).
If you want to reconfigure the script, just double click `reconfigure.cmd`.

### Linux/Mac OS X
1. Unpack the archieve wherever you want
2. Run `chmod +x ingress-ice.sh&&./ingress-ice.sh` in console and follow the instructions
3. It will save captured screenshots with into `ice-2014-07-13--09-13-37.png`, `ice-2014-07-13--09-14-07.png`...
5. You can run it from any folder where you want to save screenshots.

If you want to reconfigure the script, run `./ingress-ice.sh -r`. If you want to use cookies instead of login and password, see [cookies authentication](https://github.com/nibogd/ingress-ice/wiki/Cookies-Authentication). In case Ingress ICE crashes sometimes, run it with option `-s`: it will run ICE in an endless loop.
If you want to reconfigure the script, run `./ingress-ice.sh -r`. In case Ingress ICE crashes sometimes, run it with option `-s`: it will run ICE in an endless loop.

#### Creating videos
To create a video from your screenshots, you can use *MPlayer* [(Windows download)](http://oss.netfarm.it/mplayer-win32.php) (install from your repo if on linux). It includes a `mencoder` command. The following will produce an `.avi` video:
(Detailed instruction for windows [here](https://github.com/nibogd/ingress-ice/wiki/Creating-videos-(Windows)))
```
mencoder mf://*.png -mf w=1366:h=768:fps=4:type=png -ovc lavc -lavcopts vcodec=mpeg4:mbd=2:trell -oac copy -o ingress-ice.avi
```

Change 1366 and 768 to your width and height, fps=4 to your FPS (more FPS - faster video, but shorter)

#### Troubleshooting
If you have problems logging in, that may be a CAPTCHA (see [#106](https://github.com/nibogd/ingress-ice/issues/106#issuecomment-282949206)). Try visiting https://accounts.google.com/displayunlockcaptcha and following the instructions.

If that doesn't help or you have a different problem, feel free to [open an issue](https://github.com/nibogd/ingress-ice/issues/new).
If you have problems logging in, that may be a CAPTCHA. Try visiting https://accounts.google.com/displayunlockcaptcha and following the instructions.

#### Contributors
You can see the list [here](https://github.com/nibogd/ingress-ice/graphs/contributors).

#### Support
If you like Ingress Ice, [support us at Bountysource](https://salt.bountysource.com/teams/ingress-ice)!

<hr>
ICE uses [PhantomJS](http://phantomjs.org/), it's binary is packed with the script.
[the main dev](https://ingress.netlify.com)
[c2nprds](https://github.com/c2nprds)
[serjvanilla](https://github.com/serjvanilla)
[pheanex](https://github.com/pheanex)
[mxxcon](https://github.com/mxxcon)
[mfcanovas](https://github.com/mfcanovas)
[sndirsch](https://github.com/sndirsch)
[CyBot](https://github.com/CyBot)
[fesse](https://github.com/fesse)
[tom-eagle92](https://github.com/tom-eagle92)
[rawdr](https://github.com/rawdr)
[mcdoubleyou](https://github.com/mcdoubleyou)
[RomanIsko](https://github.com/RomanIsko)
[jankatins](https://github.com/jankatins)
[EdJoPaTo](https://github.com/EdJoPaTo)

#### Backers
See backers.md.
6 changes: 2 additions & 4 deletions ice/ice.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
/**
* @file Ingress-ICE, the main script
* @author nibogd (https://github.com/nibogd)
* @version 4.5.1
* @version 4.5.3
* @license MIT
* @see {@link https://github.com/nibogd/ingress-ice|GitHub }
* @see {@link https://ingress.netlify.com/|Website }
*/

Expand All @@ -16,7 +14,7 @@
var system = require('system');
var args = system.args;
var fs = require('fs');
var version = '4.5.2';
var version = '4.5.3';
var filename = 'ice.js';
var iceFolder = args[0].substring(0, args[0].length - filename.length) + 'modules/';
var iceModules= fs.list(iceFolder).sort();
Expand Down
3 changes: 1 addition & 2 deletions ice/ingress-ice.conf.sample
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This is a configuration file for Ingress Ice (github.com/nibogd/ingress-ice)
# This is a configuration file for Ingress Ice (https://ingress.netlify.com)
# Insert your settings here (after '=' without spaces). Only first three settings (login, password and area link) are mandatory.
#
# After modifying this file, save it and close the editor. Ice will start automatically.
Expand All @@ -23,7 +23,6 @@ height=768
#> Inject IITC? (true/false)
iitc=false
plugins=["https://static.iitc.me/build/release/plugins/link-show-direction.user.js"]
# Read more at https://github.com/nibogd/ingress-ice/wiki/Loading-IITC-plugins
pluginsConfig=[{"key":"plugin-linkshowdirection-mode","value":"Static near origin"},{"key":"iitc-base-map","value":"Google Roads"}]
#> Put a timestamp on your screenshots? (true/false)
timestamp=true
Expand Down
2 changes: 1 addition & 1 deletion ice/modules/ice-10-utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,6 @@ function quit(err) {
* Greeter. Beautiful ASCII-Art logo.
*/
function greet() {
console.log('\n _____ ) ___ _____) \n (, / (__/_____) / \n / / )__ \n ___/__ / / \n(__ / (______) (_____) v' + version + '\n\nIf you need help or want a new feature, visit https://github.com/nibogd/ingress-ice/issues');
console.log('\n _____ ) ___ _____) \n (, / (__/_____) / \n / / )__ \n ___/__ / / \n(__ / (______) (_____) v' + version + '\n\nhttps://ingress.netlify.com');
}

5 changes: 2 additions & 3 deletions ingress-ice.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
@echo off
SETLOCAL EnableDelayedExpansion
REM ingress-ice start script
REM (http://github.com/nibogd/ingress-ice)
REM Double-click this file and follow the
REM instructions

Expand Down Expand Up @@ -48,7 +47,7 @@ pause
goto :eof
:help
echo Ingress ICE, an automated screenshooter for ingress intel map
echo Copyright (c) Nikitakun (github.com/nibogd)
echo Copyright (c) https://ingress.netlify.com
echo.
echo Usage:
echo ingress-ice.cmd [-r] [-h]
Expand All @@ -57,5 +56,5 @@ echo Options:
echo -r Edit the configuration
echo -h Print this help
echo.
echo Please visit https://ingress.netlify.com/ or http://github.com/nibogd/ingress-ice for more information
echo Please visit https://ingress.netlify.com/ for more information
:eof
9 changes: 3 additions & 6 deletions ingress-ice.sh
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ echo_help() {
echo " -o Delete old config and configure ice from scratch"
echo " -s Run Ingress ICE in an endless loop (it will restart automatically after an error)"
echo ""
echo "Please visit https://ingress.netlify.com/ or http://github.com/nibogd/ingress-ice for more information"
echo "Please visit https://ingress.netlify.com/ for more information"
exit;
}

Expand Down Expand Up @@ -125,15 +125,12 @@ while getopts "h?rolsc:ai:" opt; do
h|\?) echo_help;;
i) NFILE=$OPTARG;;
a) if [ ! $TEXT ]; then
$DIALOG --title "Credits" --msgbox "Ingress ICE (Distributed under the MIT License)\n\nAuthors:\n Nikitakun (http://github.com/nibogd) @ni_bogd\n\nContributors:\n(See https://github.com/nibogd/ingress-ice/graphs/contributors)" 16 52;exit;
$DIALOG --title "Credits" --msgbox "Ingress ICE (Distributed under the MIT License)\n\nAuthors:\n https://ingress.netlify.com" 16 52;exit;
else
echo "Ingress ICE (Distributed under the MIT License)"
echo ""
echo "Authors:"
echo " Nikitakun (http://github.com/nibogd)"
echo ""
echo "Contributors:"
echo "(See the full list here: https://github.com/nibogd/ingress-ice/graphs/contributors)"
echo " https://ingress.netlify.com"
exit;
fi;;
o) if [ -z "$NFILE" ]; then
Expand Down

0 comments on commit 929abac

Please sign in to comment.